Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changed call stats info

Browse source
This commit is contained in:
Erwan Croze 2016-09-27 11:51:57 +02:00
parent 572ba2db94
commit bef153939f
3 changed files with 351 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

294
res/layout/incall_stats.xml
View file

@ -1,33 +1,30 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical|center"
android:id="@+id/call_stats_audio"
android:textStyle="bold"
android:textColor="@color/colorB"
android:textSize="18sp"
android:text="@string/call_stats_audio"
tools:gravity="center" />
<TableLayout <TableLayout
android:id="@+id/callStats" android:id="@+id/callStatsAudio"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="left|center"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:paddingRight="5dp"> android:paddingRight="5dp">
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left|center_vertical"
android:id="@+id/call_stats_title"
android:textStyle="bold"
android:textColor="@color/colorB"
android:textSize="18sp"/>
</TableRow>
<TableRow <TableRow
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -42,11 +39,11 @@
android:textSize="12sp"/> android:textSize="12sp"/>
<TextView <TextView
android:id="@+id/codec" android:id="@+id/codec_audio"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:gravity="right|center_vertical" android:gravity="left|center_vertical"
android:textColor="@color/colorB" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>
@ -66,11 +63,11 @@
android:textSize="12sp"/> android:textSize="12sp"/>
<TextView <TextView
android:id="@+id/uploadBandwith" android:id="@+id/uploadBandwith_audio"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:gravity="right|center_vertical" android:gravity="left|center_vertical"
android:textColor="@color/colorB" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>
@ -90,11 +87,11 @@
android:textSize="12sp"/> android:textSize="12sp"/>
<TextView <TextView
android:id="@+id/downloadBandwith" android:id="@+id/downloadBandwith_audio"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:gravity="right|center_vertical" android:gravity="left|center_vertical"
android:textColor="@color/colorB" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>
@ -114,18 +111,17 @@
android:textSize="12sp"/> android:textSize="12sp"/>
<TextView <TextView
android:id="@+id/ice" android:id="@+id/ice_audio"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:gravity="right|center_vertical" android:gravity="left|center_vertical"
android:textColor="@color/colorB" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@+id/video_resolution_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -133,17 +129,257 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:text="@string/call_stats_video_resolution" android:text="@string/call_stats_sender_loss_rate"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@color/colorB" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>
<TextView <TextView
android:id="@+id/video_resolution" android:id="@+id/senderLossRateAudio"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:gravity="right|center_vertical" android:gravity="left|center_vertical"
android:textColor="@color/colorB"
android:textSize="12sp"/>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left|center_vertical"
android:text="@string/call_stats_receiver_loss_rate"
android:textStyle="bold"
android:textColor="@color/colorB"
android:textSize="12sp"/>
<TextView
android:id="@+id/receiverLossRateAudio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:gravity="left|center_vertical"
android:textColor="@color/colorB"
android:textSize="12sp"/>
</TableRow>
</TableLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical|center"
android:id="@+id/call_stats_video"
android:textStyle="bold"
android:textColor="@color/colorB"
android:textSize="18sp"
android:text="@string/call_stats_video"
tools:gravity="center" />
<TableLayout
android:id="@+id/callStatsVideo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="left|center"
android:paddingBottom="10dp"
android:paddingLeft="5dp"
android:paddingRight="5dp">
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left|center_vertical"
android:text="@string/call_stats_codec"
android:textStyle="bold"
android:textColor="@color/colorB"
android:textSize="12sp"/>
<TextView
android:id="@+id/codec_video"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:gravity="left|center_vertical"
android:textColor="@color/colorB"
android:textSize="12sp"/>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left|center_vertical"
android:text="@string/call_stats_upload"
android:textStyle="bold"
android:textColor="@color/colorB"
android:textSize="12sp"/>
<TextView
android:id="@+id/uploadBandwith_video"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:gravity="left|center_vertical"
android:textColor="@color/colorB"
android:textSize="12sp"/>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left|center_vertical"
android:text="@string/call_stats_download"
android:textColor="@color/colorB"
android:textStyle="bold"
android:textSize="12sp"/>
<TextView
android:id="@+id/downloadBandwith_video"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:gravity="left|center_vertical"
android:textColor="@color/colorB"
android:textSize="12sp"/>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left|center_vertical"
android:text="@string/call_stats_ice"
android:textStyle="bold"
android:textColor="@color/colorB"
android:textSize="12sp"/>
<TextView
android:id="@+id/ice_video"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:gravity="left|center_vertical"
android:textColor="@color/colorB"
android:textSize="12sp"/>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left|center_vertical"
android:text="@string/call_stats_sender_loss_rate"
android:textStyle="bold"
android:textColor="@color/colorB"
android:textSize="12sp"/>
<TextView
android:id="@+id/senderLossRateVideo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:gravity="left|center_vertical"
android:textColor="@color/colorB"
android:textSize="12sp"/>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left|center_vertical"
android:text="@string/call_stats_receiver_loss_rate"
android:textStyle="bold"
android:textColor="@color/colorB"
android:textSize="12sp"/>
<TextView
android:id="@+id/receiverLossRateVideo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:gravity="left|center_vertical"
android:textColor="@color/colorB"
android:textSize="12sp"/>
</TableRow>
<TableRow
android:id="@+id/video_resolution_layout_sent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left|center_vertical"
android:text="@string/call_stats_video_resolution_sent"
android:textStyle="bold"
android:textColor="@color/colorB"
android:textSize="12sp"/>
<TextView
android:id="@+id/video_resolution_sent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:gravity="left|center_vertical"
android:textColor="@color/colorB"
android:textSize="12sp"/>
</TableRow>
<TableRow
android:id="@+id/video_resolution_layout_received"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left|center_vertical"
android:text="@string/call_stats_video_resolution_received"
android:textStyle="bold"
android:textColor="@color/colorB"
android:textSize="12sp"/>
<TextView
android:id="@+id/video_resolution_received"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:gravity="left|center_vertical"
android:textColor="@color/colorB" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>

5
res/values/strings.xml
View file

@ -204,7 +204,10 @@
<string name="call_stats_upload">Upload bandwidth:</string> <string name="call_stats_upload">Upload bandwidth:</string>
<string name="call_stats_download">Download bandwidth:</string> <string name="call_stats_download">Download bandwidth:</string>
<string name="call_stats_ice">ICE connectivity:</string> <string name="call_stats_ice">ICE connectivity:</string>
<string name="call_stats_video_resolution">Video size:</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_sender_loss_rate">Sender loss rate</string>
<string name="call_stats_receiver_loss_rate">Receiver loss rate</string>
<string name="call">Call</string> <string name="call">Call</string>
<!-- About --> <!-- About -->

131
src/org/linphone/StatusFragment.java
View file

@ -437,6 +437,37 @@ public class StatusFragment extends Fragment {
ZRTPdialog.show(); ZRTPdialog.show();
} }
} }
private void displayMediaStats(LinphoneCallParams params, LinphoneCallStats stats
, PayloadType media , View layout, TextView title, TextView codec, TextView dl
, TextView ul, TextView ice, TextView senderLossRate, TextView receiverLossRate
, TextView videoResolutionSent, TextView videoResolutionReceived, boolean isVideo) {
if (stats != null) {
layout.setVisibility(View.VISIBLE);
title.setVisibility(TextView.VISIBLE);
if (media != null) {
String mime = media.getMime();
if (LinphoneManager.getLc().openH264Enabled() &&
media.getMime().equals("H264") &&
LinphoneManager.getInstance().getOpenH264DownloadHelper().isCodecFound()) {
mime = "OpenH264";
}
codec.setText(mime + " / " + (media.getRate() / 1000) + "kHz");
}
dl.setText(String.valueOf((int) stats.getDownloadBandwidth()) + " kbits/s");
ul.setText(String.valueOf((int) stats.getUploadBandwidth()) + " kbits/s");
ice.setText(stats.getIceState().toString());
senderLossRate.setText(stats.getSenderLossRate() + "%");
receiverLossRate.setText(stats.getReceiverLossRate()+ "%");
if (isVideo) {
videoResolutionSent.setText("\u2191 " + params.getSentVideoSize().toDisplayableString());
videoResolutionReceived.setText("\u2193 " + params.getReceivedVideoSize().toDisplayableString());
}
} else {
layout.setVisibility(View.GONE);
title.setVisibility(TextView.GONE);
}
}
public void initCallStatsRefresher(final LinphoneCall call, final View view) { public void initCallStatsRefresher(final LinphoneCall call, final View view) {
if (mTimer != null && mTask != null) { if (mTimer != null && mTask != null) {
@ -452,15 +483,37 @@ public class StatusFragment extends Fragment {
return; return;
} }
final TextView title = (TextView) view.findViewById(R.id.call_stats_title); final TextView titleAudio = (TextView) view.findViewById(R.id.call_stats_audio);
final TextView codec = (TextView) view.findViewById(R.id.codec); final TextView titleVideo = (TextView) view.findViewById(R.id.call_stats_video);
final TextView dl = (TextView) view.findViewById(R.id.downloadBandwith);
final TextView ul = (TextView) view.findViewById(R.id.uploadBandwith); final TextView codecAudio = (TextView) view.findViewById(R.id.codec_audio);
final TextView ice = (TextView) view.findViewById(R.id.ice); final TextView codecVideo = (TextView) view.findViewById(R.id.codec_video);
final TextView videoResolution = (TextView) view.findViewById(R.id.video_resolution);
final View videoResolutionLayout = view.findViewById(R.id.video_resolution_layout); final TextView dlAudio = (TextView) view.findViewById(R.id.downloadBandwith_audio);
final TextView ulAudio = (TextView) view.findViewById(R.id.uploadBandwith_audio);
final TextView dlVideo = (TextView) view.findViewById(R.id.downloadBandwith_video);
final TextView ulVideo = (TextView) view.findViewById(R.id.uploadBandwith_video);
final TextView iceAudio = (TextView) view.findViewById(R.id.ice_audio);
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 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);
final TextView receiverLossRateVideo = (TextView) view.findViewById(R.id.receiverLossRateVideo);
final View videoLayout = view.findViewById(R.id.callStatsVideo);
final View audioLayout = view.findViewById(R.id.callStatsAudio);
if (codec == null || dl == null || ul == null || ice == null || videoResolution == null || videoResolutionLayout == null) { if (titleAudio == null || codecAudio == null || dlVideo == null || iceAudio == null
|| videoResolutionSent == null || videoLayout == null || titleVideo == null
|| codecVideo == null || dlAudio == null || ulAudio == null
|| ulVideo == null || iceVideo == null || videoResolutionReceived == null) {
mTimer.cancel(); mTimer.cancel();
return; return;
} }
@ -469,44 +522,27 @@ public class StatusFragment extends Fragment {
@Override @Override
public void run() { public void run() {
synchronized(LinphoneManager.getLc()) { synchronized(LinphoneManager.getLc()) {
final LinphoneCallParams params = call.getCurrentParamsCopy(); LinphoneCallParams params = call.getCurrentParamsCopy();
if (params.getVideoEnabled()) { if (params != null) {
final LinphoneCallStats videoStats = call.getVideoStats(); LinphoneCallStats audioStats = call.getAudioStats();
final LinphoneCallStats audioStats = call.getAudioStats(); LinphoneCallStats videoStats = null;
if (videoStats != null && audioStats != null) {
title.setText("Video"); if (params.getVideoEnabled())
PayloadType payloadAudio = params.getUsedAudioCodec(); videoStats = call.getVideoStats();
PayloadType payloadVideo = params.getUsedVideoCodec();
if (payloadVideo != null && payloadAudio != null) { PayloadType payloadAudio = params.getUsedAudioCodec();
String videoMime = payloadVideo.getMime(); PayloadType payloadVideo = params.getUsedVideoCodec();
if (LinphoneManager.getLc().openH264Enabled() &&
payloadVideo.getMime().equals("H264") && displayMediaStats(params, audioStats, payloadAudio, audioLayout
LinphoneManager.getInstance().getOpenH264DownloadHelper().isCodecFound()) { , titleAudio, codecAudio, dlAudio, ulAudio, iceAudio
videoMime = "OpenH264"; , senderLossRateAudio, receiverLossRateAudio, null, null
} , false);
codec.setText(videoMime + " / " + payloadAudio.getMime() + (payloadAudio.getRate() / 1000));
} displayMediaStats(params, videoStats, payloadVideo, videoLayout
dl.setText(String.valueOf((int) videoStats.getDownloadBandwidth()) + " / " + (int) audioStats.getDownloadBandwidth() + " kbits/s"); , titleVideo, codecVideo, dlVideo, ulVideo, iceVideo
ul.setText(String.valueOf((int) videoStats.getUploadBandwidth()) + " / " + (int) audioStats.getUploadBandwidth() + " kbits/s"); , senderLossRateVideo, receiverLossRateVideo
ice.setText(videoStats.getIceState().toString()); , videoResolutionSent, videoResolutionReceived
, true);
videoResolutionLayout.setVisibility(View.VISIBLE);
videoResolution.setText("\u2191 " + params.getSentVideoSize().toDisplayableString() + " / \u2193 " + params.getReceivedVideoSize().toDisplayableString());
}
} else {
final LinphoneCallStats audioStats = call.getAudioStats();
if (audioStats != null) {
title.setText("Audio");
PayloadType payload = params.getUsedAudioCodec();
if (payload != null) {
codec.setText(payload.getMime() + (payload.getRate() / 1000));
}
dl.setText(String.valueOf((int) audioStats.getDownloadBandwidth()) + " kbits/s");
ul.setText(String.valueOf((int) audioStats.getUploadBandwidth()) + " kbits/s");
ice.setText(audioStats.getIceState().toString());
videoResolutionLayout.setVisibility(View.GONE);
}
} }
} }
} }
@ -515,7 +551,4 @@ public class StatusFragment extends Fragment {
}; };
mTimer.scheduleAtFixedRate(mTask, 0, 1000); mTimer.scheduleAtFixedRate(mTask, 0, 1000);
} }
} }