Rename SetProcessParams -> SetTestConfig.

webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 551 matching lines @@
            psnr_result.average, psnr_result.min, ssim_result.average,
            ssim_result.min);
     printf("\n");
 
     // Remove analysis file.
     if (remove(config_.output_filename.c_str()) < 0) {
       fprintf(stderr, "Failed to remove temporary file!\n");
     }
   }
 
-  static void SetProcessParams(TestConfig* config,
-                               bool hw_codec,
-                               bool use_single_core,
-                               float packet_loss_probability,
-                               int key_frame_interval,
-                               std::string filename,
-                               bool verbose_logging,
-                               bool batch_mode) {
-    // Configure input filename.
+  static void SetTestConfig(TestConfig* config,
+                            bool hw_codec,
+                            bool use_single_core,
+                            float packet_loss_probability,
+                            std::string filename,
+                            bool verbose_logging,
+                            bool batch_mode) {
     config->filename = filename;
     config->input_filename = ResourcePath(filename, "yuv");
     // Generate an output filename in a safe way.
     config->output_filename =
         TempFilename(OutputPath(), "videoprocessor_integrationtest");
+    config->networking_config.packet_loss_probability = packet_loss_probability;

[brandtr, 2017/08/09 10:55:31]

Reordered to match definitions in TestConfig.

+    config->use_single_core = use_single_core;
+    config->verbose = verbose_logging;
     config->hw_codec = hw_codec;
-    config->use_single_core = use_single_core;
-    config->keyframe_interval = key_frame_interval;
-    config->networking_config.packet_loss_probability = packet_loss_probability;
-    config->verbose = verbose_logging;
     config->batch_mode = batch_mode;
   }
 
   static void SetCodecSettings(TestConfig* config,
                                VideoCodecType codec_type,
                                int num_temporal_layers,
                                bool error_concealment_on,
                                bool denoising_on,
                                bool frame_dropper_on,
                                bool spatial_resize_on,
                                bool resilience_on,
                                int width,
                                int height) {
     VideoCodingModule::Codec(codec_type, &config->codec_settings);
     config->codec_settings.width = width;
     config->codec_settings.height = height;
     switch (config->codec_settings.codecType) {
+      case kVideoCodecVP8:
+        config->codec_settings.VP8()->resilience =

[brandtr, 2017/08/09 10:55:31]

Reordered to match definitions in VideoCodecVP8

+            resilience_on ? kResilientStream : kResilienceOff;
+        config->codec_settings.VP8()->numberOfTemporalLayers =
+            num_temporal_layers;
+        config->codec_settings.VP8()->denoisingOn = denoising_on;
+        config->codec_settings.VP8()->errorConcealmentOn = error_concealment_on;
+        config->codec_settings.VP8()->automaticResizeOn = spatial_resize_on;
+        config->codec_settings.VP8()->frameDroppingOn = frame_dropper_on;
+        config->codec_settings.VP8()->keyFrameInterval = kBaseKeyFrameInterval;
+        break;
+      case kVideoCodecVP9:
+        config->codec_settings.VP9()->resilienceOn = resilience_on;
+        config->codec_settings.VP9()->numberOfTemporalLayers =
+            num_temporal_layers;
+        config->codec_settings.VP9()->denoisingOn = denoising_on;
+        config->codec_settings.VP9()->frameDroppingOn = frame_dropper_on;
+        config->codec_settings.VP9()->keyFrameInterval = kBaseKeyFrameInterval;
+        config->codec_settings.VP9()->automaticResizeOn = spatial_resize_on;
+        break;
       case kVideoCodecH264:
         config->codec_settings.H264()->frameDroppingOn = frame_dropper_on;
         config->codec_settings.H264()->keyFrameInterval = kBaseKeyFrameInterval;
         break;
-      case kVideoCodecVP8:
-        config->codec_settings.VP8()->errorConcealmentOn = error_concealment_on;
-        config->codec_settings.VP8()->denoisingOn = denoising_on;
-        config->codec_settings.VP8()->numberOfTemporalLayers =
-            num_temporal_layers;
-        config->codec_settings.VP8()->frameDroppingOn = frame_dropper_on;
-        config->codec_settings.VP8()->automaticResizeOn = spatial_resize_on;
-        config->codec_settings.VP8()->keyFrameInterval = kBaseKeyFrameInterval;
-        config->codec_settings.VP8()->resilience =
-            resilience_on ? kResilientStream : kResilienceOff;
-        break;
-      case kVideoCodecVP9:
-        config->codec_settings.VP9()->denoisingOn = denoising_on;
-        config->codec_settings.VP9()->numberOfTemporalLayers =
-            num_temporal_layers;
-        config->codec_settings.VP9()->frameDroppingOn = frame_dropper_on;
-        config->codec_settings.VP9()->automaticResizeOn = spatial_resize_on;
-        config->codec_settings.VP9()->keyFrameInterval = kBaseKeyFrameInterval;
-        config->codec_settings.VP9()->resilienceOn = resilience_on;
-        break;
       default:
         RTC_NOTREACHED();
         break;
     }
 
     config->frame_length_in_bytes =
         CalcBufferSize(VideoType::kI420, width, height);
   }
 
   static void SetRateProfile(RateProfile* rate_profile,
@@ skipping 70 matching lines @@
   int start_frame_rate_;
 
   // Codec and network settings.
   int num_temporal_layers_;
 };
 
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_INTEGRATIONTEST_H_