Rename config structs in VideoProcessor tests.

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 44 matching lines @@
 
 const int kPercTargetvsActualMismatch = 20;
 const int kBaseKeyFrameInterval = 3000;
 
 // Default sequence is foreman (CIF): may be better to use VGA for resize test.
 const int kCifWidth = 352;
 const int kCifHeight = 288;
 const char kFilenameForemanCif[] = "foreman_cif";
 
 // Codec and network settings.
-struct CodecConfigPars {
+struct CodecParams {
   VideoCodecType codec_type;
   bool hw_codec;
-  float packet_loss;
+
+  int width;
+  int height;
+
   int num_temporal_layers;
   int key_frame_interval;
   bool error_concealment_on;
   bool denoising_on;
   bool frame_dropper_on;
   bool spatial_resize_on;
-  int width;
-  int height;
+
+  float packet_loss;
+
   std::string filename;
   bool verbose_logging;
 };
 
-// Quality metrics.
-struct QualityMetrics {
-  double minimum_avg_psnr;

[brandtr, 2017/02/21 12:04:31]

'minimum' -> 'min' to harmonize with RateControlThreshold field naming.

-  double minimum_min_psnr;
-  double minimum_avg_ssim;
-  double minimum_min_ssim;
+// Thresholds for the quality metrics.
+struct QualityThresholds {
+  double min_avg_psnr;
+  double min_min_psnr;
+  double min_avg_ssim;
+  double min_min_ssim;
 };
 
-// The sequence of bitrate and frame rate changes for the encoder, the frame
+// The sequence of bit rate and frame rate changes for the encoder, the frame
 // number where the changes are made, and the total number of frames for the
 // test.
 struct RateProfile {
   int target_bit_rate[kMaxNumRateUpdates];
   int input_frame_rate[kMaxNumRateUpdates];
   int frame_index_rate_update[kMaxNumRateUpdates + 1];
   int num_frames;
 };
 
-// Metrics for the rate control. The rate mismatch metrics are defined as
-// percentages.|max_time_hit_target| is defined as number of frames, after a
-// rate update is made to the encoder, for the encoder to reach within
-// |kPercTargetvsActualMismatch| of new target rate. The metrics are defined for
-// each rate update sequence.
-struct RateControlMetrics {
+// Thresholds for the rate control metrics. The rate mismatch thresholds are
+// defined as percentages. |max_time_hit_target| is defined as number of frames,
+// after a rate update is made to the encoder, for the encoder to reach within
+// |kPercTargetvsActualMismatch| of new target rate. The thresholds are defined
+// for each rate update sequence.
+struct RateControlThresholds {
   int max_num_dropped_frames;
   int max_key_frame_size_mismatch;
   int max_delta_frame_size_mismatch;
   int max_encoding_rate_mismatch;
   int max_time_hit_target;
   int num_spatial_resizes;
   int num_key_frames;
 };
 
 // Should video files be saved persistently to disk for post-run visualization?
 struct VisualizationParams {
   bool save_source_y4m;
   bool save_encoded_ivf;
   bool save_decoded_y4m;
 };
 
 #if !defined(WEBRTC_IOS)
 const int kNumFramesShort = 100;
 #endif
 const int kNumFramesLong = 299;
 
 // Parameters from VP8 wrapper, which control target size of key frames.
 const float kInitialBufferSize = 0.5f;
 const float kOptimalBufferSize = 0.6f;
 const float kScaleKeyFrameSize = 0.5f;
 
 // Integration test for video processor. Encodes+decodes a clip and
 // writes it to the output directory. After completion, quality metrics
-// (PSNR and SSIM) and rate control metrics are computed to verify that the
-// quality and encoder response is acceptable. The rate control tests allow us
-// to verify the behavior for changing bitrate, changing frame rate, frame
-// dropping/spatial resize, and temporal layers. The limits for the rate
-// control metrics are set to be fairly conservative, so failure should only
-// happen when some significant regression or breakdown occurs.
+// (PSNR and SSIM) and rate control metrics are computed and compared to given
+// thresholds, to verify that the quality and encoder response is acceptable.
+// The rate control tests allow us to verify the behavior for changing bit rate,
+// changing frame rate, frame dropping/spatial resize, and temporal layers.
+// The thresholds for the rate control metrics are set to be fairly
+// conservative, so failure should only happen when some significant regression
+// or breakdown occurs.
 class VideoProcessorIntegrationTest : public testing::Test {
  protected:
   VideoProcessorIntegrationTest() {
 #if defined(WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED) && \
     defined(WEBRTC_ANDROID)
     InitializeAndroidObjects();
 
     external_encoder_factory_.reset(
         new webrtc_jni::MediaCodecVideoEncoderFactory());
     external_decoder_factory_.reset(
@@ skipping 220 matching lines @@
     perc_encoding_rate_mismatch_ =
         100 * fabs(encoding_bitrate_total_ - bit_rate_) / bit_rate_;
     if (perc_encoding_rate_mismatch_ < kPercTargetvsActualMismatch &&
         !encoding_rate_within_target_) {
       num_frames_to_hit_target_ = num_frames_total_;
       encoding_rate_within_target_ = true;
     }
   }
 
   // Verify expected behavior of rate control and print out data.
-  void VerifyRateControl(int update_index,

[brandtr, 2017/02/21 12:04:31]

To harmonize with the "UpdateRateControlMetrics" method.

-                         int max_key_frame_size_mismatch,
-                         int max_delta_frame_size_mismatch,
-                         int max_encoding_rate_mismatch,
-                         int max_time_hit_target,
-                         int max_num_dropped_frames,
-                         int num_spatial_resizes,
-                         int num_key_frames) {
+  void VerifyRateControlMetrics(int update_index,
+                                int max_key_frame_size_mismatch,
+                                int max_delta_frame_size_mismatch,
+                                int max_encoding_rate_mismatch,
+                                int max_time_hit_target,
+                                int max_num_dropped_frames,
+                                int num_spatial_resizes,
+                                int num_key_frames) {
     int num_dropped_frames = processor_->NumberDroppedFrames();
     int num_resize_actions = processor_->NumberSpatialResizes();
     printf(
         "For update #: %d,\n"
         " Target Bitrate: %d,\n"
         " Encoding bitrate: %f,\n"
         " Frame rate: %d \n",
         update_index, bit_rate_, encoding_bitrate_total_, frame_rate_);
     printf(
         " Number of frames to approach target rate: %d, \n"
@@ skipping 33 matching lines @@
       EXPECT_LE(perc_frame_size_mismatch, max_delta_frame_size_mismatch);
       EXPECT_LE(perc_encoding_rate_mismatch, max_encoding_rate_mismatch);
     }
     printf("\n");
     EXPECT_LE(num_frames_to_hit_target_, max_time_hit_target);
     EXPECT_LE(num_dropped_frames, max_num_dropped_frames);
     EXPECT_EQ(num_resize_actions, num_spatial_resizes);
     EXPECT_EQ(num_key_frames_, num_key_frames);
   }
 
+  void VerifyQuality(const test::QualityMetricsResult& psnr_result,
+                     const test::QualityMetricsResult& ssim_result,
+                     const QualityThresholds& quality_thresholds) {
+    EXPECT_GT(psnr_result.average, quality_thresholds.min_avg_psnr);
+    EXPECT_GT(psnr_result.min, quality_thresholds.min_min_psnr);
+    EXPECT_GT(ssim_result.average, quality_thresholds.min_avg_ssim);
+    EXPECT_GT(ssim_result.min, quality_thresholds.min_min_ssim);
+  }
+
   // Layer index corresponding to frame number, for up to 3 layers.
   void LayerIndexForFrame(int frame_number) {
     if (num_temporal_layers_ == 1) {
       layer_ = 0;
     } else if (num_temporal_layers_ == 2) {
       // layer 0:  0     2     4 ...
       // layer 1:     1     3
       if (frame_number % 2 == 0) {
         layer_ = 0;
       } else {
@@ skipping 31 matching lines @@
       }
       frame_rate_layer_[i] =
           frame_rate_ / static_cast<float>(1 << (num_temporal_layers_ - 1));
     }
     if (num_temporal_layers_ == 3) {
       frame_rate_layer_[2] = frame_rate_ / 2.0f;
     }
   }
 
   // Processes all frames in the clip and verifies the result.
-  void ProcessFramesAndVerify(QualityMetrics quality_metrics,
+  void ProcessFramesAndVerify(QualityThresholds quality_thresholds,
                               RateProfile rate_profile,
-                              CodecConfigPars process,
-                              RateControlMetrics* rc_metrics,
+                              CodecParams process,
+                              RateControlThresholds* rc_thresholds,
                               const VisualizationParams* visualization_params) {
     // Codec/config settings.
     codec_type_ = process.codec_type;
     hw_codec_ = process.hw_codec;
     start_bitrate_ = rate_profile.target_bit_rate[0];
     start_frame_rate_ = rate_profile.input_frame_rate[0];
     packet_loss_ = process.packet_loss;
     key_frame_interval_ = process.key_frame_interval;
     num_temporal_layers_ = process.num_temporal_layers;
     error_concealment_on_ = process.error_concealment_on;
@@ skipping 28 matching lines @@
       // Counter for whole sequence run.
       ++frame_number;
       // Counters for each rate update.
       ++num_frames_per_update_[layer_];
       ++num_frames_total_;
       UpdateRateControlMetrics(frame_number, frame_type);
       // If we hit another/next update, verify stats for current state and
       // update layers and codec with new rates.
       if (frame_number ==
           rate_profile.frame_index_rate_update[update_index + 1]) {
-        VerifyRateControl(
-            update_index, rc_metrics[update_index].max_key_frame_size_mismatch,
-            rc_metrics[update_index].max_delta_frame_size_mismatch,
-            rc_metrics[update_index].max_encoding_rate_mismatch,
-            rc_metrics[update_index].max_time_hit_target,
-            rc_metrics[update_index].max_num_dropped_frames,
-            rc_metrics[update_index].num_spatial_resizes,
-            rc_metrics[update_index].num_key_frames);
+        VerifyRateControlMetrics(
+            update_index,
+            rc_thresholds[update_index].max_key_frame_size_mismatch,
+            rc_thresholds[update_index].max_delta_frame_size_mismatch,
+            rc_thresholds[update_index].max_encoding_rate_mismatch,
+            rc_thresholds[update_index].max_time_hit_target,
+            rc_thresholds[update_index].max_num_dropped_frames,
+            rc_thresholds[update_index].num_spatial_resizes,
+            rc_thresholds[update_index].num_key_frames);
         // Update layer rates and the codec with new rates.
         ++update_index;
         bit_rate_ = rate_profile.target_bit_rate[update_index];
         frame_rate_ = rate_profile.input_frame_rate[update_index];
         SetLayerRates();
         ResetRateControlMetrics(
             rate_profile.frame_index_rate_update[update_index + 1]);
         processor_->SetRates(bit_rate_, frame_rate_);
       }
     }
-    VerifyRateControl(update_index,
-                      rc_metrics[update_index].max_key_frame_size_mismatch,
-                      rc_metrics[update_index].max_delta_frame_size_mismatch,
-                      rc_metrics[update_index].max_encoding_rate_mismatch,
-                      rc_metrics[update_index].max_time_hit_target,
-                      rc_metrics[update_index].max_num_dropped_frames,
-                      rc_metrics[update_index].num_spatial_resizes,
-                      rc_metrics[update_index].num_key_frames);
+    VerifyRateControlMetrics(
+        update_index, rc_thresholds[update_index].max_key_frame_size_mismatch,
+        rc_thresholds[update_index].max_delta_frame_size_mismatch,
+        rc_thresholds[update_index].max_encoding_rate_mismatch,
+        rc_thresholds[update_index].max_time_hit_target,
+        rc_thresholds[update_index].max_num_dropped_frames,
+        rc_thresholds[update_index].num_spatial_resizes,
+        rc_thresholds[update_index].num_key_frames);
     EXPECT_EQ(num_frames, frame_number);
     EXPECT_EQ(num_frames + 1, static_cast<int>(stats_.stats_.size()));
 
     // Release encoder and decoder to make sure they have finished processing:
     RTC_DCHECK_EQ(WEBRTC_VIDEO_CODEC_OK, encoder_->Release());
     RTC_DCHECK_EQ(WEBRTC_VIDEO_CODEC_OK, decoder_->Release());
 
     // Close the analysis files before we use them for SSIM/PSNR calculations.
     analysis_frame_reader_->Close();
     analysis_frame_writer_->Close();
@@ skipping 13 matching lines @@
     test::QualityMetricsResult psnr_result, ssim_result;
     RTC_DCHECK_EQ(0, test::I420MetricsFromFiles(config_.input_filename.c_str(),
                                                 config_.output_filename.c_str(),
                                                 config_.codec_settings->width,
                                                 config_.codec_settings->height,
                                                 &psnr_result, &ssim_result));
     printf("PSNR avg: %f, min: %f\nSSIM avg: %f, min: %f\n",
            psnr_result.average, psnr_result.min, ssim_result.average,
            ssim_result.min);
     stats_.PrintSummary();
-    EXPECT_GT(psnr_result.average, quality_metrics.minimum_avg_psnr);
-    EXPECT_GT(psnr_result.min, quality_metrics.minimum_min_psnr);
-    EXPECT_GT(ssim_result.average, quality_metrics.minimum_avg_ssim);
-    EXPECT_GT(ssim_result.min, quality_metrics.minimum_min_ssim);
+    VerifyQuality(psnr_result, ssim_result, quality_thresholds);
 
     // Remove analysis file.
     if (remove(config_.output_filename.c_str()) < 0) {
       fprintf(stderr, "Failed to remove temporary file!\n");
     }
   }
 
-  static void SetCodecParameters(CodecConfigPars* process_settings,
-                                 VideoCodecType codec_type,
-                                 bool hw_codec,
-                                 float packet_loss,
-                                 int key_frame_interval,
-                                 int num_temporal_layers,
-                                 bool error_concealment_on,
-                                 bool denoising_on,
-                                 bool frame_dropper_on,
-                                 bool spatial_resize_on,
-                                 int width,
-                                 int height,
-                                 const std::string& filename,
-                                 bool verbose_logging) {
+  static void SetCodecParams(CodecParams* process_settings,
+                             VideoCodecType codec_type,
+                             bool hw_codec,
+                             float packet_loss,
+                             int key_frame_interval,
+                             int num_temporal_layers,
+                             bool error_concealment_on,
+                             bool denoising_on,
+                             bool frame_dropper_on,
+                             bool spatial_resize_on,
+                             int width,
+                             int height,
+                             const std::string& filename,
+                             bool verbose_logging) {
     process_settings->codec_type = codec_type;
     process_settings->hw_codec = hw_codec;
     process_settings->packet_loss = packet_loss;
     process_settings->key_frame_interval = key_frame_interval;
     process_settings->num_temporal_layers = num_temporal_layers,
     process_settings->error_concealment_on = error_concealment_on;
     process_settings->denoising_on = denoising_on;
     process_settings->frame_dropper_on = frame_dropper_on;
     process_settings->spatial_resize_on = spatial_resize_on;
     process_settings->width = width;
     process_settings->height = height;
     process_settings->filename = filename;
     process_settings->verbose_logging = verbose_logging;
   }
 
-  static void SetCodecParameters(CodecConfigPars* process_settings,
-                                 VideoCodecType codec_type,
-                                 bool hw_codec,
-                                 float packet_loss,
-                                 int key_frame_interval,
-                                 int num_temporal_layers,
-                                 bool error_concealment_on,
-                                 bool denoising_on,
-                                 bool frame_dropper_on,
-                                 bool spatial_resize_on) {
-    SetCodecParameters(process_settings, codec_type, hw_codec, packet_loss,
-                       key_frame_interval, num_temporal_layers,
-                       error_concealment_on, denoising_on, frame_dropper_on,
-                       spatial_resize_on, kCifWidth, kCifHeight,
-                       kFilenameForemanCif, false /* verbose_logging */);
+  static void SetCodecParams(CodecParams* process_settings,
+                             VideoCodecType codec_type,
+                             bool hw_codec,
+                             float packet_loss,
+                             int key_frame_interval,
+                             int num_temporal_layers,
+                             bool error_concealment_on,
+                             bool denoising_on,
+                             bool frame_dropper_on,
+                             bool spatial_resize_on) {
+    SetCodecParams(process_settings, codec_type, hw_codec, packet_loss,
+                   key_frame_interval, num_temporal_layers,
+                   error_concealment_on, denoising_on, frame_dropper_on,
+                   spatial_resize_on, kCifWidth, kCifHeight,
+                   kFilenameForemanCif, false /* verbose_logging */);
   }
 
-  static void SetQualityMetrics(QualityMetrics* quality_metrics,
-                                double minimum_avg_psnr,
-                                double minimum_min_psnr,
-                                double minimum_avg_ssim,
-                                double minimum_min_ssim) {
-    quality_metrics->minimum_avg_psnr = minimum_avg_psnr;
-    quality_metrics->minimum_min_psnr = minimum_min_psnr;
-    quality_metrics->minimum_avg_ssim = minimum_avg_ssim;
-    quality_metrics->minimum_min_ssim = minimum_min_ssim;
+  static void SetQualityThresholds(QualityThresholds* quality_thresholds,
+                                   double min_avg_psnr,
+                                   double min_min_psnr,
+                                   double min_avg_ssim,
+                                   double min_min_ssim) {
+    quality_thresholds->min_avg_psnr = min_avg_psnr;
+    quality_thresholds->min_min_psnr = min_min_psnr;
+    quality_thresholds->min_avg_ssim = min_avg_ssim;
+    quality_thresholds->min_min_ssim = min_min_ssim;
   }
 
-  static void SetRateProfilePars(RateProfile* rate_profile,
-                                 int update_index,
-                                 int bit_rate,
-                                 int frame_rate,
-                                 int frame_index_rate_update) {
+  static void SetRateProfile(RateProfile* rate_profile,
+                             int update_index,
+                             int bit_rate,
+                             int frame_rate,
+                             int frame_index_rate_update) {
     rate_profile->target_bit_rate[update_index] = bit_rate;
     rate_profile->input_frame_rate[update_index] = frame_rate;
     rate_profile->frame_index_rate_update[update_index] =
         frame_index_rate_update;
   }
 
-  static void SetRateControlMetrics(RateControlMetrics* rc_metrics,
-                                    int update_index,
-                                    int max_num_dropped_frames,
-                                    int max_key_frame_size_mismatch,
-                                    int max_delta_frame_size_mismatch,
-                                    int max_encoding_rate_mismatch,
-                                    int max_time_hit_target,
-                                    int num_spatial_resizes,
-                                    int num_key_frames) {
-    rc_metrics[update_index].max_num_dropped_frames = max_num_dropped_frames;
-    rc_metrics[update_index].max_key_frame_size_mismatch =
+  static void SetRateControlThresholds(RateControlThresholds* rc_thresholds,
+                                       int update_index,
+                                       int max_num_dropped_frames,
+                                       int max_key_frame_size_mismatch,
+                                       int max_delta_frame_size_mismatch,
+                                       int max_encoding_rate_mismatch,
+                                       int max_time_hit_target,
+                                       int num_spatial_resizes,
+                                       int num_key_frames) {
+    rc_thresholds[update_index].max_num_dropped_frames = max_num_dropped_frames;
+    rc_thresholds[update_index].max_key_frame_size_mismatch =
         max_key_frame_size_mismatch;
-    rc_metrics[update_index].max_delta_frame_size_mismatch =
+    rc_thresholds[update_index].max_delta_frame_size_mismatch =
         max_delta_frame_size_mismatch;
-    rc_metrics[update_index].max_encoding_rate_mismatch =
+    rc_thresholds[update_index].max_encoding_rate_mismatch =
         max_encoding_rate_mismatch;
-    rc_metrics[update_index].max_time_hit_target = max_time_hit_target;
-    rc_metrics[update_index].num_spatial_resizes = num_spatial_resizes;
-    rc_metrics[update_index].num_key_frames = num_key_frames;
+    rc_thresholds[update_index].max_time_hit_target = max_time_hit_target;
+    rc_thresholds[update_index].num_spatial_resizes = num_spatial_resizes;
+    rc_thresholds[update_index].num_key_frames = num_key_frames;
   }
 
   // Codecs.
   std::unique_ptr<VideoEncoder> encoder_;
   std::unique_ptr<cricket::WebRtcVideoEncoderFactory> external_encoder_factory_;
   std::unique_ptr<VideoDecoder> decoder_;
   std::unique_ptr<cricket::WebRtcVideoDecoderFactory> external_decoder_factory_;
   VideoCodec codec_settings_;
 
   // Helper objects.
@@ skipping 45 matching lines @@
   bool error_concealment_on_;
   bool denoising_on_;
   bool frame_dropper_on_;
   bool spatial_resize_on_;
 };
 
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_INTEGRATIONTEST_H_