commit 2e69d58b8ddbcfaebf764e0f0180814dd8735c37
author Lajos Molnar <lajos@google.com> Tue Nov 15 21:26:42 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 15 21:26:42 2016 +0000
tree 93503c3e0aeb39fc8daab93095a610eb08526d2c
parent c7dd3d1fae2207ce0203db28731cec8bed7ebb9d
parent 6a40e09d1b57950d0eb1c1068c217b6b9e17dd66

media: log reported frame rates for media dashboard am: 7374ddf450 am: 7e3ffb47d6 am: dc6e6f2ceb am: 8edb6e0566 am: 5755873b47 am: a6dd96e79b
am: 6a40e09d1b

Change-Id: Ie080eb7afd879953a9ee3b9bbc821f7351fddbd3

libs/deviceutil/src/android/cts/util/MediaPerfUtils.java

diff --git a/libs/deviceutil/src/android/cts/util/MediaPerfUtils.java b/libs/deviceutil/src/android/cts/util/MediaPerfUtils.java
index f691150..decbd4c 100644
--- a/libs/deviceutil/src/android/cts/util/MediaPerfUtils.java
+++ b/libs/deviceutil/src/android/cts/util/MediaPerfUtils.java
@@ -54,14 +54,15 @@
     public static String addPerformanceHeadersToLog(
             DeviceReportLog log, String message, int round, String codecName,
             MediaFormat configFormat, MediaFormat inputFormat, MediaFormat outputFormat) {
+        String mime = configFormat.getString(MediaFormat.KEY_MIME);
+        int width = configFormat.getInteger(MediaFormat.KEY_WIDTH);
+        int height = configFormat.getInteger(MediaFormat.KEY_HEIGHT);
+
         log.addValue("round", round, ResultType.NEUTRAL, ResultUnit.NONE);
         log.addValue("codec_name", codecName, ResultType.NEUTRAL, ResultUnit.NONE);
-        log.addValue("mime_type", configFormat.getString(MediaFormat.KEY_MIME),
-                ResultType.NEUTRAL, ResultUnit.NONE);
-        log.addValue("width", configFormat.getInteger(MediaFormat.KEY_WIDTH),
-                ResultType.NEUTRAL, ResultUnit.NONE);
-        log.addValue("height", configFormat.getInteger(MediaFormat.KEY_HEIGHT),
-                ResultType.NEUTRAL, ResultUnit.NONE);
+        log.addValue("mime_type", mime, ResultType.NEUTRAL, ResultUnit.NONE);
+        log.addValue("width", width, ResultType.NEUTRAL, ResultUnit.NONE);
+        log.addValue("height", height, ResultType.NEUTRAL, ResultUnit.NONE);
         log.addValue("config_format", formatForReport(configFormat),
                 ResultType.NEUTRAL, ResultUnit.NONE);
         log.addValue("input_format", formatForReport(inputFormat),
@@ -71,6 +72,16 @@
 
         message += " codec=" + codecName + " round=" + round + " configFormat=" + configFormat
                 + " inputFormat=" + inputFormat + " outputFormat=" + outputFormat;
+
+        Range<Double> reported =
+            MediaUtils.getVideoCapabilities(codecName, mime)
+                    .getAchievableFrameRatesFor(width, height);
+        if (reported != null) {
+            log.addValue("reported_low", reported.getLower(), ResultType.NEUTRAL, ResultUnit.FPS);
+            log.addValue("reported_high", reported.getUpper(), ResultType.NEUTRAL, ResultUnit.FPS);
+            message += " reported=" + reported.getLower() + "-" + reported.getUpper();
+        }
+
         return message;
     }