| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2015 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 } | 187 } |
| 188 if (targetBitrate != null) { | 188 if (targetBitrate != null) { |
| 189 encoderStat.append("Target BR: ").append(targetBitrate).append("\n"); | 189 encoderStat.append("Target BR: ").append(targetBitrate).append("\n"); |
| 190 } | 190 } |
| 191 if (actualBitrate != null) { | 191 if (actualBitrate != null) { |
| 192 encoderStat.append("Actual BR: ").append(actualBitrate).append("\n"); | 192 encoderStat.append("Actual BR: ").append(actualBitrate).append("\n"); |
| 193 } | 193 } |
| 194 } | 194 } |
| 195 | 195 |
| 196 if (cpuMonitor != null) { | 196 if (cpuMonitor != null) { |
| 197 encoderStat.append("CPU%: ").append(cpuMonitor.getCpuUsageCurrent()) | 197 encoderStat.append("CPU%: ") |
| 198 .append(". Freq: ").append(cpuMonitor.getCpuFrequencyScaleCurrent()); | 198 .append(cpuMonitor.getCpuUsageCurrent()).append("/") |
| 199 .append(cpuMonitor.getCpuUsageAverage()) |
| 200 .append(". Freq: ").append(cpuMonitor.getFrequencyScaleAverage()); |
| 199 } | 201 } |
| 200 encoderStatView.setText(encoderStat.toString()); | 202 encoderStatView.setText(encoderStat.toString()); |
| 201 } | 203 } |
| 202 } | 204 } |
| OLD | NEW |