From beb5e235ff329d7526d6249848bf3c461aab4def Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 29 May 2017 14:02:02 +0200
Subject: [PATCH] Display FPS in call stats view

---
 res/layout/incall_stats.xml                | 21 ++++++++++++++++++++-
 res/values/strings.xml                     |  2 ++
 src/android/org/linphone/CallActivity.java | 14 ++++++++++++--
 submodules/linphone                        |  2 +-
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/res/layout/incall_stats.xml b/res/layout/incall_stats.xml
index 99a084b95..6d8aee2cf 100644
--- a/res/layout/incall_stats.xml
+++ b/res/layout/incall_stats.xml
@@ -259,7 +259,6 @@
 				android:textColor="@color/colorB"
 				android:textSize="12sp"/>
 
-
 			<TextView
 				android:id="@+id/video_resolution_received"
 				android:layout_width="match_parent"
@@ -270,6 +269,26 @@
 				android:textColor="@color/colorB"
 				android:textSize="12sp"/>
 
+			<TextView
+				android:id="@+id/video_fps_sent"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="5dp"
+				android:text="@string/call_stats_video_fps_sent"
+				android:gravity="center"
+				android:textColor="@color/colorB"
+				android:textSize="12sp"/>
+
+			<TextView
+				android:id="@+id/video_fps_received"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="5dp"
+				android:text="@string/call_stats_video_fps_received"
+				android:gravity="center"
+				android:textColor="@color/colorB"
+				android:textSize="12sp"/>
+
 		</TableLayout>
 	</LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 081f721c3..2e768a448 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -221,6 +221,8 @@
     <string name="call_stats_ice">ICE connectivity:</string>
     <string name="call_stats_video_resolution_sent">Sent video resolution:</string>
     <string name="call_stats_video_resolution_received">Received video resolution:</string>
+    <string name="call_stats_video_fps_sent">Sent video fps:</string>
+    <string name="call_stats_video_fps_received">Received video fps:</string>
     <string name="call_stats_sender_loss_rate">Sender loss rate:</string>
     <string name="call_stats_receiver_loss_rate">Receiver loss rate:</string>
     <string name="call_stats_jitter_buffer">Jitter buffer:</string>
diff --git a/src/android/org/linphone/CallActivity.java b/src/android/org/linphone/CallActivity.java
index 1efc3bde6..765f7bf61 100644
--- a/src/android/org/linphone/CallActivity.java
+++ b/src/android/org/linphone/CallActivity.java
@@ -1585,7 +1585,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 			, PayloadType media , View layout, TextView title, TextView codec, TextView dl
 			, TextView ul, TextView ice, TextView ip, TextView senderLossRate
 			, TextView receiverLossRate, TextView enc, TextView dec, TextView videoResolutionSent
-			, TextView videoResolutionReceived, boolean isVideo, TextView jitterBuffer) {
+			, TextView videoResolutionReceived, TextView videoFpsSent, TextView videoFpsReceived
+			, boolean isVideo, TextView jitterBuffer) {
 		if (stats != null) {
 			String mime = null;
 
@@ -1621,6 +1622,12 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 				formatText(videoResolutionReceived,
 						getString(R.string.call_stats_video_resolution_received),
 						"\u2193 " + params.getReceivedVideoSize().toDisplayableString());
+				formatText(videoFpsSent,
+						getString(R.string.call_stats_video_fps_sent),
+						"\u2191 " + params.getSentFramerate());
+				formatText(videoFpsReceived,
+						getString(R.string.call_stats_video_fps_received),
+						"\u2193 " + params.getReceivedFramerate());
 			} else {
 				formatText(jitterBuffer, getString(R.string.call_stats_jitter_buffer),
 						new DecimalFormat("##.##").format(stats.getJitterBufferSize()) + " ms");
@@ -1652,6 +1659,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 		final TextView iceVideo = (TextView) view.findViewById(R.id.ice_video);
 		final TextView videoResolutionSent = (TextView) view.findViewById(R.id.video_resolution_sent);
 		final TextView videoResolutionReceived = (TextView) view.findViewById(R.id.video_resolution_received);
+		final TextView videoFpsSent = (TextView) view.findViewById(R.id.video_fps_sent);
+		final TextView videoFpsReceived = (TextView) view.findViewById(R.id.video_fps_received);
 		final TextView senderLossRateAudio = (TextView) view.findViewById(R.id.senderLossRateAudio);
 		final TextView receiverLossRateAudio = (TextView) view.findViewById(R.id.receiverLossRateAudio);
 		final TextView senderLossRateVideo = (TextView) view.findViewById(R.id.senderLossRateVideo);
@@ -1701,7 +1710,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 									displayMediaStats(params, audioStats, payloadAudio, audioLayout
 											, titleAudio, codecAudio, dlAudio, ulAudio, iceAudio
 											, ipAudio, senderLossRateAudio, receiverLossRateAudio
-											, encoderAudio, decoderAudio, null, null
+											, encoderAudio, decoderAudio, null, null, null, null
 											, false, jitterBufferAudio);
 
 									displayMediaStats(params, videoStats, payloadVideo, videoLayout
@@ -1709,6 +1718,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 											, ipVideo, senderLossRateVideo, receiverLossRateVideo
 											, encoderVideo, decoderVideo
 											, videoResolutionSent, videoResolutionReceived
+											,videoFpsSent, videoFpsReceived
 											, true, null);
 								}
 							}
diff --git a/submodules/linphone b/submodules/linphone
index 609888e81..57792f401 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 609888e8127d77fdef45f95434d0f976af7f1828
+Subproject commit 57792f40144982a181961dc98f727c09968c69c4