From: Joshua Colp <jcolp@digium.com>
Date: Thu, 19 Sep 2019 13:23:15 +0000 (-0500)
Subject: Merge "func_jitterbuffer: Add audio/video sync support."
X-Git-Tag: 18.0.0-rc1~368
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e79a3b428adecec7bb1222d7f22664493cc3e498;p=thirdparty%2Fasterisk.git

Merge "func_jitterbuffer: Add audio/video sync support."
---

e79a3b428adecec7bb1222d7f22664493cc3e498
diff --cc res/res_rtp_asterisk.c
index e96223f7a7,8c04ac1181..c65cf627d1
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@@ -4684,11 -4584,8 +4675,11 @@@ static int rtp_raw_write(struct ast_rtp
  	int pred, mark = 0;
  	unsigned int ms = calc_txstamp(rtp, &frame->delivery);
  	struct ast_sockaddr remote_address = { {0,} };
- 	int rate = rtp_get_rate(frame->subclass.format) / 1000;
+ 	int rate = ast_rtp_get_rate(frame->subclass.format) / 1000;
  	unsigned int seqno;
 +#ifdef TEST_FRAMEWORK
 +	struct ast_rtp_engine_test *test = ast_rtp_instance_get_test(instance);
 +#endif
  
  	if (ast_format_cmp(frame->subclass.format, ast_format_g722) == AST_FORMAT_CMP_EQUAL) {
  		frame->samples /= 2;