| Index: webrtc/examples/androidapp/src/org/appspot/apprtc/HudFragment.java
|
| diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/HudFragment.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/HudFragment.java
|
| index cc7015b8a69ab2656f4e109652e1fa8269050bce..776765e6b7de1b3186528e5231928d640ba6aa54 100644
|
| --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/HudFragment.java
|
| +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/HudFragment.java
|
| @@ -38,7 +38,7 @@ public class HudFragment extends Fragment {
|
| private boolean videoCallEnabled;
|
| private boolean displayHud;
|
| private volatile boolean isRunning;
|
| - private final CpuMonitor cpuMonitor = new CpuMonitor();
|
| + private CpuMonitor cpuMonitor;
|
|
|
| @Override
|
| public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
| @@ -89,6 +89,10 @@ public class HudFragment extends Fragment {
|
| super.onStop();
|
| }
|
|
|
| + public void setCpuMonitor(CpuMonitor cpuMonitor) {
|
| + this.cpuMonitor = cpuMonitor;
|
| + }
|
| +
|
| private void hudViewsSetProperties(int visibility) {
|
| hudViewBwe.setVisibility(visibility);
|
| hudViewConnection.setVisibility(visibility);
|
| @@ -189,11 +193,9 @@ public class HudFragment extends Fragment {
|
| }
|
| }
|
|
|
| - if (cpuMonitor.sampleCpuUtilization()) {
|
| - encoderStat.append("CPU%: ")
|
| - .append(cpuMonitor.getCpuCurrent()).append("/")
|
| - .append(cpuMonitor.getCpuAvg3()).append("/")
|
| - .append(cpuMonitor.getCpuAvgAll());
|
| + if (cpuMonitor != null) {
|
| + encoderStat.append("CPU%: ").append(cpuMonitor.getCpuUsageCurrent())
|
| + .append(". Freq: ").append(cpuMonitor.getCpuFrequencyScaleCurrent());
|
| }
|
| encoderStatView.setText(encoderStat.toString());
|
| }
|
|
|