diff options
| author | Chris Craik <ccraik@google.com> | 2012-03-20 14:27:23 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2012-03-20 14:30:30 -0700 |
| commit | 6f92c15180f66d0ec7c8b20ea47f479468255970 (patch) | |
| tree | e29dcea4a1df6ca2be16e3f25c7d2a06384e1963 /tests/TileBenchmark | |
| parent | 4d3f82e8d99558551b876ad075ad999cb92f5327 (diff) | |
| download | frameworks_base-6f92c15180f66d0ec7c8b20ea47f479468255970.zip frameworks_base-6f92c15180f66d0ec7c8b20ea47f479468255970.tar.gz frameworks_base-6f92c15180f66d0ec7c8b20ea47f479468255970.tar.bz2 | |
Factor viewport scaling into coverage calculation
Change-Id: I32114ead0ca42eaf2161d516a4281da216b61fa4
Diffstat (limited to 'tests/TileBenchmark')
| -rw-r--r-- | tests/TileBenchmark/src/com/test/tilebenchmark/PlaybackGraphs.java | 10 | ||||
| -rw-r--r-- | tests/TileBenchmark/src/com/test/tilebenchmark/RunData.java | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tests/TileBenchmark/src/com/test/tilebenchmark/PlaybackGraphs.java b/tests/TileBenchmark/src/com/test/tilebenchmark/PlaybackGraphs.java index a3ae9be..065e86f 100644 --- a/tests/TileBenchmark/src/com/test/tilebenchmark/PlaybackGraphs.java +++ b/tests/TileBenchmark/src/com/test/tilebenchmark/PlaybackGraphs.java @@ -37,10 +37,10 @@ public class PlaybackGraphs { private static Paint whiteLabels; private static double viewportCoverage(TileData view, TileData tile) { - if (tile.left < view.right - && tile.right >= view.left - && tile.top < view.bottom - && tile.bottom >= view.top) { + if (tile.left < (view.right * view.scale) + && tile.right >= (view.left * view.scale) + && tile.top < (view.bottom * view.scale) + && tile.bottom >= (view.top * view.scale)) { return 1.0f; } return 0.0f; @@ -215,7 +215,7 @@ public class PlaybackGraphs { int lastBar = 0; for (int frameIndex = 0; frameIndex < data.frames.length; frameIndex++) { TileData frame[] = data.frames[frameIndex]; - int newBar = (frame[0].top + frame[0].bottom) / 2; + int newBar = (int)((frame[0].top + frame[0].bottom) * frame[0].scale / 2.0f); MetricGen s = Metrics[metricIndex]; double absoluteValue = s.getValue(frame); diff --git a/tests/TileBenchmark/src/com/test/tilebenchmark/RunData.java b/tests/TileBenchmark/src/com/test/tilebenchmark/RunData.java index 2da61cc..5e48afd 100644 --- a/tests/TileBenchmark/src/com/test/tilebenchmark/RunData.java +++ b/tests/TileBenchmark/src/com/test/tilebenchmark/RunData.java @@ -46,7 +46,8 @@ public class RunData implements Serializable { public String toString() { return "Tile (" + left + "," + top + ")->(" - + right + "," + bottom + ")"; + + right + "," + bottom + ")" + + (isReady ? "ready" : "NOTready") + " at scale " + scale; } } |