media: combine log to reduce the size

Bug: 22504214
Change-Id: I1d1c689d45d6f05805d7f5c76bd7feb384b09edf
diff --git a/libs/deviceutil/src/android/cts/util/MediaUtils.java b/libs/deviceutil/src/android/cts/util/MediaUtils.java
index 46f8a00..c04a2cf 100644
--- a/libs/deviceutil/src/android/cts/util/MediaUtils.java
+++ b/libs/deviceutil/src/android/cts/util/MediaUtils.java
@@ -461,13 +461,10 @@
 
     public static void logResults(ReportLog log, String prefix,
             double min, double max, double avg, double stdev) {
-        log.printValue(prefix + " fps", 1000000000 / min, ResultType.HIGHER_BETTER, ResultUnit.FPS);
-        log.printValue(prefix + " TimeDiffNsMin", min, ResultType.LOWER_BETTER, ResultUnit.NONE);
-        log.printValue(prefix + " TimeDiffNsMax", max, ResultType.LOWER_BETTER, ResultUnit.NONE);
-        log.printValue(prefix + " TimeDiffNsAverage",
-                avg, ResultType.LOWER_BETTER, ResultUnit.NONE);
-        log.printValue(prefix + " TimeDiffNsStdev",
-                stdev, ResultType.LOWER_BETTER, ResultUnit.NONE);
+        String msg = prefix;
+        msg += " min=" + Math.round(min / 1000) + " max=" + Math.round(max / 1000) +
+                " avg=" + Math.round(avg / 1000) + " stdev=" + Math.round(stdev / 1000);
+        log.printValue(msg, 1000000000 / min, ResultType.HIGHER_BETTER, ResultUnit.FPS);
     }
 
     public static VideoCapabilities getVideoCapabilities(String codecName, String mime) {
diff --git a/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java b/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java
index 09d1212..8fc5a44 100644
--- a/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java
+++ b/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java
@@ -539,7 +539,7 @@
                 double encMax = Stat.getMax(avgs);
                 double encAvg = MediaUtils.getAverage(mEncoderFrameTimeDiff[i]);
                 double encStdev = MediaUtils.getStdev(avgs);
-                String prefix = "codec=" + encoderName + " size=" + w + "x" + h + " round=" + i +
+                String prefix = "codec=" + encoderName + " round=" + i +
                         " EncInputFormat=" + mEncInputFormat +
                         " EncOutputFormat=" + mEncOutputFormat;
                 MediaUtils.logResults(mReportLog, prefix, encMin, encMax, encAvg, encStdev);
diff --git a/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java b/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
index 0653949..ede5040 100644
--- a/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
+++ b/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
@@ -264,7 +264,7 @@
 
         String testConfig = "codec=" + name +
                 " decodeto=" + ((surface == null) ? "buffer" : "surface") +
-                " size=" + w + "x" + h + " round=" + round +
+                " mime=" + mime + " round=" + round +
                 " DecOutputFormat=" + mDecOutputFormat;
 
         String message = "average fps for " + testConfig;