TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 05:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove frame rate reporter and unused FPS ringbuffer.

Browse Source
This commit is contained in:
Alan Evans 2020-06-24 11:44:35 -03:00
parent 4ea861fe5c
commit 3741493cb7
1 changed files with 4 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
app/src/main/java/org/thoughtcrime/securesms/util/FrameRateTracker.java
View File

@ -3,13 +3,11 @@ package org.thoughtcrime.securesms.util;
import android.content.Context; import android.content.Context;
import android.view.Choreographer; import android.view.Choreographer;
import android.view.Display; import android.view.Display;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.logging.Log;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -23,30 +21,20 @@ public class FrameRateTracker {
private static final String TAG = Log.tag(FrameRateTracker.class); private static final String TAG = Log.tag(FrameRateTracker.class);
private static final long REPORTING_INTERVAL = TimeUnit.SECONDS.toMillis(1);
private static final int MAX_CONSECUTIVE_FRAME_LOGS = 10; private static final int MAX_CONSECUTIVE_FRAME_LOGS = 10;
private static final int MAX_CONSECUTIVE_INTERVAL_LOGS = 10;
private final Context context; private final Context context;
private final List<Double> fpsData;
private final RingBuffer runningAverageFps;
private double refreshRate; private double refreshRate;
private long idealTimePerFrameNanos; private long idealTimePerFrameNanos;
private long badFrameThresholdNanos; private long badFrameThresholdNanos;
private double badIntervalThresholdFps;
private long lastFrameTimeNanos; private long lastFrameTimeNanos;
private long lastReportTimeNanos;
private long consecutiveFrameWarnings; private long consecutiveFrameWarnings;
private long consecutiveIntervalWarnings;
public FrameRateTracker(@NonNull Context context) { public FrameRateTracker(@NonNull Context context) {
this.context = context; this.context = context;
this.fpsData = new ArrayList<>();
this.runningAverageFps = new RingBuffer(TimeUnit.SECONDS.toMillis(10));
updateRefreshRate(); updateRefreshRate();
} }
@ -55,22 +43,12 @@ public class FrameRateTracker {
Log.d(TAG, String.format(Locale.ENGLISH, "Beginning frame rate tracking. Screen refresh rate: %.2f hz, or %.2f ms per frame.", refreshRate, idealTimePerFrameNanos / (float) 1_000_000)); Log.d(TAG, String.format(Locale.ENGLISH, "Beginning frame rate tracking. Screen refresh rate: %.2f hz, or %.2f ms per frame.", refreshRate, idealTimePerFrameNanos / (float) 1_000_000));
lastFrameTimeNanos = System.nanoTime(); lastFrameTimeNanos = System.nanoTime();
lastReportTimeNanos = System.nanoTime();
Choreographer.getInstance().postFrameCallback(calculator); Choreographer.getInstance().postFrameCallback(calculator);
Choreographer.getInstance().postFrameCallbackDelayed(reporter, 1000);
} }
public void end() { public void end() {
Choreographer.getInstance().removeFrameCallback(calculator); Choreographer.getInstance().removeFrameCallback(calculator);
Choreographer.getInstance().removeFrameCallback(reporter);
fpsData.clear();
runningAverageFps.clear();
}
public double getRunningAverageFps() {
return runningAverageFps.getAverage();
} }
/** /**
@ -96,7 +74,6 @@ public class FrameRateTracker {
this.refreshRate = getDisplayRefreshRate(context); this.refreshRate = getDisplayRefreshRate(context);
this.idealTimePerFrameNanos = (long) (TimeUnit.SECONDS.toNanos(1) / refreshRate); this.idealTimePerFrameNanos = (long) (TimeUnit.SECONDS.toNanos(1) / refreshRate);
this.badFrameThresholdNanos = idealTimePerFrameNanos * (int) (refreshRate / 4); this.badFrameThresholdNanos = idealTimePerFrameNanos * (int) (refreshRate / 4);
this.badIntervalThresholdFps = refreshRate / 2;
} }
} }
@ -116,77 +93,8 @@ public class FrameRateTracker {
consecutiveFrameWarnings = 0; consecutiveFrameWarnings = 0;
} }
fpsData.add(fps);
runningAverageFps.add(fps);
lastFrameTimeNanos = frameTimeNanos; lastFrameTimeNanos = frameTimeNanos;
Choreographer.getInstance().postFrameCallback(this); Choreographer.getInstance().postFrameCallback(this);
} }
}; };
private final Choreographer.FrameCallback reporter = new Choreographer.FrameCallback() {
@Override
public void doFrame(long frameTimeNanos) {
double averageFps = 0;
int size = fpsData.size();
for (double fps : fpsData) {
averageFps += fps / size;
}
if (averageFps < badIntervalThresholdFps) {
if (consecutiveIntervalWarnings < MAX_CONSECUTIVE_INTERVAL_LOGS) {
Log.w(TAG, String.format(Locale.ENGLISH, "Bad interval! Average of %.2f FPS over the last %d ms", averageFps, TimeUnit.NANOSECONDS.toMillis(frameTimeNanos - lastReportTimeNanos)));
consecutiveIntervalWarnings++;
}
} else {
consecutiveIntervalWarnings = 0;
}
lastReportTimeNanos = frameTimeNanos;
updateRefreshRate();
Choreographer.getInstance().postFrameCallbackDelayed(this, REPORTING_INTERVAL);
}
};
private static class RingBuffer {
private final long interval;
private final ArrayDeque<Long> timestamps;
private final ArrayDeque<Double> elements;
RingBuffer(long interval) {
this.interval = interval;
this.timestamps = new ArrayDeque<>();
this.elements = new ArrayDeque<>();
}
void add(double value) {
long currentTime = System.currentTimeMillis();
while (!timestamps.isEmpty() && timestamps.getFirst() < (currentTime - interval)) {
timestamps.pollFirst();
elements.pollFirst();
}
timestamps.addLast(currentTime);
elements.addLast(value);
}
double getAverage() {
List<Double> elementsCopy = new ArrayList<>(elements);
double average = 0;
int size = elementsCopy.size();
for (double element : elementsCopy) {
average += element / size;
}
return average;
}
void clear() {
timestamps.clear();
elements.clear();
}
}
} }