Refactor scaling.

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

 /*
  *  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 507 matching lines @@
                config_.codec_settings->width, config_.codec_settings->height,
                &psnr_result, &ssim_result));
     printf("PSNR avg: %f, min: %f    SSIM 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);
-    if (!remove(config_.output_filename.c_str())) {
-      fprintf(stderr, "Failed to remove temporary file!");
+    if (remove(config_.output_filename.c_str()) < 0) {

[nisse-webrtc, 2016/06/01 09:15:18]

This is a very unrelated bugfix, I was annoyed by the message.

+      fprintf(stderr, "Failed to remove temporary file!\n");
     }
   }
 };
 
 void SetRateProfilePars(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;
@@ skipping 457 matching lines @@
   QualityMetrics quality_metrics;
   SetQualityMetrics(&quality_metrics, 32.5, 30.0, 0.85, 0.80);
   // Metrics for rate control.
   RateControlMetrics rc_metrics[2];
   SetRateControlMetrics(rc_metrics, 0, 0, 20, 30, 10, 10, 0, 1);
   SetRateControlMetrics(rc_metrics, 1, 0, 0, 30, 15, 10, 0, 0);
   ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
                          rc_metrics);
 }
 }  // namespace webrtc