From fb61e1cf03d07e651bb82a23a61ada68f2680c87 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 5 Jun 2014 10:48:24 +0200
Subject: [PATCH] Fix AVPF status in the call current params.

---
 coreapi/linphonecall.c | 56 ++++++++++++++++++++++++++++++++++++------
 mediastreamer2         |  2 +-
 oRTP                   |  2 +-
 3 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index aa1786891..af4ab7b57 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -96,27 +96,63 @@ bool_t linphone_call_get_authentication_token_verified(LinphoneCall *call){
 	return call->auth_token_verified;
 }
 
-static bool_t linphone_call_are_all_streams_encrypted(LinphoneCall *call) {
+static bool_t linphone_call_all_streams_encrypted(const LinphoneCall *call) {
 	int number_of_encrypted_stream = 0;
 	int number_of_active_stream = 0;
 	if (call) {
 		if (call->audiostream && media_stream_get_state((MediaStream *)call->audiostream) == MSStreamStarted) {
 			number_of_active_stream++;
-			if(media_stream_is_secured((MediaStream *)call->audiostream))
+			if(media_stream_secured((MediaStream *)call->audiostream))
 				number_of_encrypted_stream++;
 		}
 		if (call->videostream && media_stream_get_state((MediaStream *)call->videostream) == MSStreamStarted) {
 			number_of_active_stream++;
-			if (media_stream_is_secured((MediaStream *)call->videostream))
+			if (media_stream_secured((MediaStream *)call->videostream))
 				number_of_encrypted_stream++;
 		}
 	}
 	return number_of_active_stream>0 && number_of_active_stream==number_of_encrypted_stream;
 }
 
+static bool_t linphone_call_all_streams_avpf_enabled(const LinphoneCall *call) {
+	int nb_active_streams = 0;
+	int nb_avpf_enabled_streams = 0;
+	if (call) {
+		if (call->audiostream && media_stream_get_state((MediaStream *)call->audiostream) == MSStreamStarted) {
+			nb_active_streams++;
+			if (media_stream_avpf_enabled((MediaStream *)call->audiostream))
+				nb_avpf_enabled_streams++;
+		}
+		if (call->videostream && media_stream_get_state((MediaStream *)call->videostream) == MSStreamStarted) {
+			nb_active_streams++;
+			if (media_stream_avpf_enabled((MediaStream *)call->videostream))
+				nb_avpf_enabled_streams++;
+		}
+	}
+	return ((nb_active_streams > 0) && (nb_active_streams == nb_avpf_enabled_streams));
+}
+
+static uint8_t linphone_call_get_avpf_rr_interval(const LinphoneCall *call) {
+	uint8_t rr_interval = 0;
+	uint8_t stream_rr_interval;
+	if (call) {
+		if (call->audiostream && media_stream_get_state((MediaStream *)call->audiostream) == MSStreamStarted) {
+			stream_rr_interval = media_stream_get_avpf_rr_interval((MediaStream *)call->audiostream);
+			if (stream_rr_interval > rr_interval) rr_interval = stream_rr_interval;
+		}
+		if (call->videostream && media_stream_get_state((MediaStream *)call->videostream) == MSStreamStarted) {
+			stream_rr_interval = media_stream_get_avpf_rr_interval((MediaStream *)call->videostream);
+			if (stream_rr_interval > rr_interval) rr_interval = stream_rr_interval;
+		}
+	} else {
+		rr_interval = 5;
+	}
+	return rr_interval;
+}
+
 static void propagate_encryption_changed(LinphoneCall *call){
 	LinphoneCore *lc=call->core;
-	if (!linphone_call_are_all_streams_encrypted(call)) {
+	if (!linphone_call_all_streams_encrypted(call)) {
 		ms_message("Some streams are not encrypted");
 		call->current_params.media_encryption=LinphoneMediaEncryptionNone;
 		if (lc->vtable.call_encryption_changed)
@@ -988,7 +1024,7 @@ const LinphoneCallParams * linphone_call_get_current_params(LinphoneCall *call){
 	}
 #endif
 
-	if (linphone_call_are_all_streams_encrypted(call)) {
+	if (linphone_call_all_streams_encrypted(call)) {
 		 if (linphone_call_get_authentication_token(call)) {
 			 call->current_params.media_encryption=LinphoneMediaEncryptionZRTP;
 		 } else {
@@ -997,6 +1033,12 @@ const LinphoneCallParams * linphone_call_get_current_params(LinphoneCall *call){
 	} else {
 		call->current_params.media_encryption=LinphoneMediaEncryptionNone;
 	}
+	call->current_params.avpf_enabled = linphone_call_all_streams_avpf_enabled(call);
+	if (call->current_params.avpf_enabled == TRUE) {
+		call->current_params.avpf_rr_interval = linphone_call_get_avpf_rr_interval(call);
+	} else {
+		call->current_params.avpf_rr_interval = 0;
+	}
 
 	return &call->current_params;
 }
@@ -2189,14 +2231,14 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut
 		params.zid_file=lc->zrtp_secrets_cache;
 		audio_stream_enable_zrtp(call->audiostream,&params);
 #if VIDEO_ENABLED
-		if (media_stream_is_secured((MediaStream *)call->audiostream) && media_stream_get_state((MediaStream *)call->videostream) == MSStreamStarted) {
+		if (media_stream_secured((MediaStream *)call->audiostream) && media_stream_get_state((MediaStream *)call->videostream) == MSStreamStarted) {
 			/*audio stream is already encrypted and video stream is active*/
 			memset(&params,0,sizeof(OrtpZrtpParams));
 			video_stream_enable_zrtp(call->videostream,call->audiostream,&params);
 		}
 #endif
 	}else{
-		call->current_params.media_encryption=linphone_call_are_all_streams_encrypted(call) ?
+		call->current_params.media_encryption=linphone_call_all_streams_encrypted(call) ?
 			LinphoneMediaEncryptionSRTP : LinphoneMediaEncryptionNone;
 	}
 
diff --git a/mediastreamer2 b/mediastreamer2
index 8ea457fa6..406505ddd 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 8ea457fa65e32c3c943e0bedea6fbdbdc18f7156
+Subproject commit 406505dddac08300d937dd5f0f1fd3e701267287
diff --git a/oRTP b/oRTP
index a9ffd72d7..30e4d5b1a 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit a9ffd72d73d459e531fad094d18eb18f67870aba
+Subproject commit 30e4d5b1abf41c7d96825a3ca194eb47b5a45c1b