From d6d46e19fa90f8fb8c0137fc4201fb9979b29319 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 10 Sep 2019 10:40:25 +0200
Subject: [PATCH] Added more info to call's stats view

---
 .../call/CallStatsChildViewHolder.java        | 30 +++++++++++++--
 .../main/res/layout-land/call_stats_child.xml | 37 ++++++++++++++-----
 app/src/main/res/layout/call_stats_child.xml  | 32 ++++++++++++----
 app/src/main/res/values/strings.xml           |  2 +
 4 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/linphone/call/CallStatsChildViewHolder.java b/app/src/main/java/org/linphone/call/CallStatsChildViewHolder.java
index fd2306337..e7fb7405a 100644
--- a/app/src/main/java/org/linphone/call/CallStatsChildViewHolder.java
+++ b/app/src/main/java/org/linphone/call/CallStatsChildViewHolder.java
@@ -54,7 +54,10 @@ public class CallStatsChildViewHolder {
     private TextView mDecoderAudio;
     private TextView mEncoderVideo;
     private TextView mDecoderVideo;
-    private TextView mDisplayFilter;
+    private TextView mAudioCaptureFilter;
+    private TextView mAudioPlayerFilter;
+    private TextView mVideoCaptureFilter;
+    private TextView mVideoDisplayFilter;
     private TextView mDlAudio;
     private TextView mUlAudio;
     private TextView mDlVideo;
@@ -90,7 +93,10 @@ public class CallStatsChildViewHolder {
         mDecoderAudio = view.findViewById(R.id.decoder_audio);
         mEncoderVideo = view.findViewById(R.id.encoder_video);
         mDecoderVideo = view.findViewById(R.id.decoder_video);
-        mDisplayFilter = view.findViewById(R.id.display_filter);
+        mAudioCaptureFilter = view.findViewById(R.id.audio_capture_filter);
+        mAudioPlayerFilter = view.findViewById(R.id.audio_player_filter);
+        mVideoCaptureFilter = view.findViewById(R.id.video_capture_device);
+        mVideoDisplayFilter = view.findViewById(R.id.display_filter);
         mDlAudio = view.findViewById(R.id.downloadBandwith_audio);
         mUlAudio = view.findViewById(R.id.uploadBandwith_audio);
         mDlVideo = view.findViewById(R.id.downloadBandwith_video);
@@ -193,11 +199,29 @@ public class CallStatsChildViewHolder {
                                                         params.getUsedVideoPayloadType();
 
                                                 formatText(
-                                                        mDisplayFilter,
+                                                        mAudioPlayerFilter,
+                                                        mContext.getString(
+                                                                R.string.call_stats_player_filter),
+                                                        mCall.getCore().getPlaybackDevice());
+
+                                                formatText(
+                                                        mAudioCaptureFilter,
+                                                        mContext.getString(
+                                                                R.string.call_stats_capture_filter),
+                                                        mCall.getCore().getCaptureDevice());
+
+                                                formatText(
+                                                        mVideoDisplayFilter,
                                                         mContext.getString(
                                                                 R.string.call_stats_display_filter),
                                                         mCall.getCore().getVideoDisplayFilter());
 
+                                                formatText(
+                                                        mVideoCaptureFilter,
+                                                        mContext.getString(
+                                                                R.string.call_stats_capture_filter),
+                                                        mCall.getCore().getVideoDevice());
+
                                                 displayMediaStats(
                                                         params,
                                                         audioStats,
diff --git a/app/src/main/res/layout-land/call_stats_child.xml b/app/src/main/res/layout-land/call_stats_child.xml
index 095503ab9..4613fd13e 100644
--- a/app/src/main/res/layout-land/call_stats_child.xml
+++ b/app/src/main/res/layout-land/call_stats_child.xml
@@ -58,7 +58,6 @@
                     android:paddingLeft="5dp"
                     android:text="@string/call_stats_encoder_name" />
 
-
                 <TextView
                     android:id="@+id/decoder_audio"
                     style="@style/call_stats_font"
@@ -68,6 +67,21 @@
                     android:paddingLeft="5dp"
                     android:text="@string/call_stats_decoder_name" />
 
+                <TextView
+                    android:id="@+id/audio_capture_filter"
+                    style="@style/call_stats_font"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingLeft="5dp" />
+
+                <TextView
+                    android:id="@+id/audio_player_filter"
+                    style="@style/call_stats_font"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingLeft="5dp" />
 
                 <TextView
                     android:id="@+id/uploadBandwith_audio"
@@ -87,7 +101,6 @@
                     android:paddingLeft="5dp"
                     android:text="@string/call_stats_download" />
 
-
                 <TextView
                     android:id="@+id/ice_audio"
                     style="@style/call_stats_font"
@@ -115,7 +128,6 @@
                     android:paddingLeft="5dp"
                     android:text="@string/call_stats_sender_loss_rate" />
 
-
                 <TextView
                     android:id="@+id/receiverLossRateAudio"
                     style="@style/call_stats_font"
@@ -135,6 +147,7 @@
                     android:text="@string/call_stats_jitter_buffer" />
 
             </TableLayout>
+
         </LinearLayout>
 
         <LinearLayout
@@ -161,7 +174,6 @@
                 android:paddingRight="5dp"
                 android:paddingBottom="10dp">
 
-
                 <TextView
                     android:id="@+id/codec_video"
                     style="@style/call_stats_font"
@@ -171,7 +183,6 @@
                     android:paddingLeft="5dp"
                     android:text="@string/call_stats_codec" />
 
-
                 <TextView
                     android:id="@+id/encoder_video"
                     style="@style/call_stats_font"
@@ -196,8 +207,15 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:paddingLeft="5dp"
-                    android:text="@string/call_stats_decoder_name" />
+                    android:paddingLeft="5dp" />
+
+                <TextView
+                    android:id="@+id/video_capture_device"
+                    style="@style/call_stats_font"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingLeft="5dp" />
 
                 <TextView
                     android:id="@+id/uploadBandwith_video"
@@ -208,7 +226,6 @@
                     android:paddingLeft="5dp"
                     android:text="@string/call_stats_upload" />
 
-
                 <TextView
                     android:id="@+id/downloadBandwith_video"
                     style="@style/call_stats_font"
@@ -254,7 +271,6 @@
                     android:paddingLeft="5dp"
                     android:text="@string/call_stats_sender_loss_rate" />
 
-
                 <TextView
                     android:id="@+id/receiverLossRateVideo"
                     style="@style/call_stats_font"
@@ -301,6 +317,9 @@
                     android:text="@string/call_stats_video_fps_received" />
 
             </TableLayout>
+
         </LinearLayout>
+
     </LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/call_stats_child.xml b/app/src/main/res/layout/call_stats_child.xml
index 70be276c4..ddd16e1ef 100644
--- a/app/src/main/res/layout/call_stats_child.xml
+++ b/app/src/main/res/layout/call_stats_child.xml
@@ -53,7 +53,6 @@
                 android:paddingLeft="5dp"
                 android:text="@string/call_stats_encoder_name" />
 
-
             <TextView
                 android:id="@+id/decoder_audio"
                 style="@style/call_stats_font"
@@ -63,6 +62,21 @@
                 android:paddingLeft="5dp"
                 android:text="@string/call_stats_decoder_name" />
 
+            <TextView
+                android:id="@+id/audio_capture_filter"
+                style="@style/call_stats_font"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="5dp" />
+
+            <TextView
+                android:id="@+id/audio_player_filter"
+                style="@style/call_stats_font"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="5dp" />
 
             <TextView
                 android:id="@+id/uploadBandwith_audio"
@@ -149,7 +163,6 @@
             android:paddingRight="5dp"
             android:paddingBottom="10dp">
 
-
             <TextView
                 android:id="@+id/codec_video"
                 style="@style/call_stats_font"
@@ -159,7 +172,6 @@
                 android:paddingLeft="5dp"
                 android:text="@string/call_stats_codec" />
 
-
             <TextView
                 android:id="@+id/encoder_video"
                 style="@style/call_stats_font"
@@ -184,8 +196,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:paddingLeft="5dp"
-                android:text="@string/call_stats_decoder_name" />
+                android:paddingLeft="5dp" />
+
+            <TextView
+                android:id="@+id/video_capture_device"
+                style="@style/call_stats_font"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="5dp" />
 
             <TextView
                 android:id="@+id/uploadBandwith_video"
@@ -196,7 +215,6 @@
                 android:paddingLeft="5dp"
                 android:text="@string/call_stats_upload" />
 
-
             <TextView
                 android:id="@+id/downloadBandwith_video"
                 style="@style/call_stats_font"
@@ -242,7 +260,6 @@
                 android:paddingLeft="5dp"
                 android:text="@string/call_stats_sender_loss_rate" />
 
-
             <TextView
                 android:id="@+id/receiverLossRateVideo"
                 style="@style/call_stats_font"
@@ -291,4 +308,5 @@
         </TableLayout>
 
     </LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6a4d11028..cf06429f1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -300,7 +300,9 @@
     <string name="call_stats_jitter_buffer">Jitter buffer:</string>
     <string name="call_stats_encoder_name">Encoder:</string>
     <string name="call_stats_decoder_name">Decoder:</string>
+    <string name="call_stats_player_filter">Player filter:</string>
     <string name="call_stats_display_filter">Display filter:</string>
+    <string name="call_stats_capture_filter">Capture filter:</string>
     <string name="call">Call</string>
     <string name="call_log_delete_dialog">Do you want to delete the selected call logs?</string>