Make use_single_core option configurable in VideoProcessorIntegrationTests.

webrtc/modules/video_coding/codecs/test/plot_webrtc_test_logs.py

 #  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
 #
 #  Use of this source code is governed by a BSD-style license
 #  that can be found in the LICENSE file in the root of the source
 #  tree. An additional intellectual property rights grant can be found
 #  in the file PATENTS.  All contributing project authors may
 #  be found in the AUTHORS file in the root of the source tree.
 
 """Plots statistics from WebRTC integration test logs.
 
@@ skipping 12 matching lines @@
 
 # Metrics to plot, tuple: (name to parse in file, label to use when plotting).
 BITRATE = ('Target Bitrate', 'bitrate (kbps)')
 WIDTH = ('Width', 'width')
 HEIGHT = ('Height', 'height')
 FILENAME = ('Filename', 'clip')
 CODEC_TYPE = ('Codec type', 'Codec')
 ENCODER_IMPLEMENTATION_NAME = ('Encoder implementation name', 'enc name')
 DECODER_IMPLEMENTATION_NAME = ('Decoder implementation name', 'dec name')
 NUM_FRAMES = ('Total # of frames', 'num frames')
-CORES = ('#CPU cores used', 'cores')
+CORES = ('#CPU cores used', 'CPU cores used')
 DENOISING = ('Denoising', 'denoising')
 RESILIENCE = ('Resilience', 'resilience')
 ERROR_CONCEALMENT = ('Error concealment', 'error concealment')
 PSNR = ('PSNR avg', 'PSNR (dB)')
 SSIM = ('SSIM avg', 'SSIM')
 ENC_BITRATE = ('Encoding bitrate', 'encoded bitrate (kbps)')
 FRAMERATE = ('Frame rate', 'fps')
 NUM_DROPPED_FRAMES = ('Number of dropped frames', 'num dropped frames')
 NUM_FRAMES_TO_TARGET = ('Number of frames to approach target rate',
                         'frames to reach target rate')
@@ skipping 95 matching lines @@
   f.close()
   return settings
 
 
 def ParseMetrics(filename, setting1, setting2):
   """Parses metrics from file.
 
   Args:
     filename: The name of the file.
     setting1: First setting for sorting metrics (e.g. width).
-    setting2: Second setting for sorting metrics (e.g. cores).
+    setting2: Second setting for sorting metrics (e.g. CPU cores used).
 
   Returns:
     A dictionary holding parsed metrics.
 
   For example:
     metrics[key1][key2][measurement]
 
   metrics = {
   "width: 352": {
-    "cores: 1.0": {
+    "CPU cores used: 1.0": {
       "encode time (us)": [0.718005, 0.806925, 0.909726, 0.931835, 0.953642],
       "PSNR (dB)": [25.546029, 29.465518, 34.723535, 36.428493, 38.686551],
       "bitrate (kbps)": [50, 100, 300, 500, 1000]
     },
-    "cores: 2.0": {
+    "CPU cores used: 2.0": {
       "encode time (us)": [0.718005, 0.806925, 0.909726, 0.931835, 0.953642],
       "PSNR (dB)": [25.546029, 29.465518, 34.723535, 36.428493, 38.686551],
       "bitrate (kbps)": [50, 100, 300, 500, 1000]
     },
   },
   "width: 176": {
-    "cores: 1.0": {
+    "CPU cores used: 1.0": {
       "encode time (us)": [0.857897, 0.91608, 0.959173, 0.971116, 0.980961],
       "PSNR (dB)": [30.243646, 33.375592, 37.574387, 39.42184, 41.437897],
       "bitrate (kbps)": [50, 100, 300, 500, 1000]
     },
   }
   } """
 
   metrics = {}
 
   # Parse events.
@@ skipping 84 matching lines @@
   return True, value
 
 
 def Plot(y_metric, x_metric, metrics):
   """Plots y_metric vs x_metric per key in metrics.
 
   For example:
     y_metric = 'PSNR (dB)'
     x_metric = 'bitrate (kbps)'
     metrics = {
-      "cores: 1.0": {
+      "CPU cores used: 1.0": {
         "PSNR (dB)": [25.546029, 29.465518, 34.723535, 36.428493, 38.686551],
         "bitrate (kbps)": [50, 100, 300, 500, 1000]
       },
-      "cores: 2.0": {
+      "CPU cores used: 2.0": {
         "PSNR (dB)": [25.546029, 29.465518, 34.723535, 36.428493, 38.686551],
         "bitrate (kbps)": [50, 100, 300, 500, 1000]
       },
     }
     """
   for key in metrics:
     data = metrics[key]
     if y_metric not in data:
       print "Failed to find metric: %s" % y_metric
       continue
@@ skipping 41 matching lines @@
   plt.xlabel(x_metric, fontsize='small')
   plt.subplots_adjust(left=0.04, right=0.98, bottom=0.04, top=0.96, hspace=0.1)
 
 
 def GetTitle(filename):
   title = ''
   codec_types = ParseSetting(filename, CODEC_TYPE[1])
   for i in range(0, len(codec_types)):
     title += codec_types[i] + ', '
 
+  cores = ParseSetting(filename, CORES[1])
+  for i in range(0, len(cores)):
+    title += cores[i].split('.')[0] + ', '
+
   framerate = ParseSetting(filename, FRAMERATE[1])
   for i in range(0, len(framerate)):
     title += framerate[i].split('.')[0] + ', '
 
   enc_names = ParseSetting(filename, ENCODER_IMPLEMENTATION_NAME[1])
   for i in range(0, len(enc_names)):
     title += enc_names[i] + ', '
 
   dec_names = ParseSetting(filename, DECODER_IMPLEMENTATION_NAME[1])
   for i in range(0, len(dec_names)):
@@ skipping 72 matching lines @@
   figsize[1] *= FIG_SIZE_SCALE_FACTOR_Y
   plt.rcParams["figure.figsize"] = figsize
 
   PlotFigure(sub_keys, y_metrics, x_metric, metrics, GetTitle(filename))
 
   plt.show()
 
 
 if __name__ == '__main__':
   main()