Clean up Stats class used in VideoProcessor tests.

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

 /*
  *  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.
  */
 
@@ skipping 173 matching lines @@
   while (frame_number < num_frames) {
     // In order to not overwhelm the OpenMAX buffers in the Android
     // MediaCodec API, we roughly pace the frames here. The downside
     // of this is that the encode run will be done in real-time.
     // TODO(brandtr): Investigate if this is needed on iOS.
     if (config_.hw_codec) {
       SleepMs(rtc::kNumMillisecsPerSec /
               rate_profile.input_frame_rate[rate_update_index]);
     }
 
-    task_queue.PostTask(
-        [this, frame_number] { processor_->ProcessFrame(frame_number); });
+    task_queue.PostTask([this] { processor_->ProcessFrame(); });
     ++frame_number;
 
     if (frame_number ==
         rate_profile.frame_index_rate_update[rate_update_index + 1]) {
       ++rate_update_index;
 
       task_queue.PostTask([this, &rate_profile, rate_update_index] {
         processor_->SetRates(rate_profile.target_bit_rate[rate_update_index],
                              rate_profile.input_frame_rate[rate_update_index]);
       });
@@ skipping 32 matching lines @@
                                             num_dropped_frames,
                                             num_resize_actions);
       ++rate_update_index;
       ResetRateControlMetrics(rate_update_index, rate_profile);
     }
   }
   PrintAndMaybeVerifyRateControlMetrics(rate_update_index, rc_thresholds,
                                         num_dropped_frames, num_resize_actions);
 
   // Calculate and print other statistics.
-  EXPECT_EQ(num_frames, static_cast<int>(stats_.stats_.size()));
+  EXPECT_EQ(num_frames, static_cast<int>(stats_.size()));
   stats_.PrintSummary();
 
   // Calculate and print image quality statistics.
   // TODO(marpan): Should compute these quality metrics per SetRates update.
   QualityMetricsResult psnr_result, ssim_result;
   EXPECT_EQ(0, I420MetricsFromFiles(config_.input_filename.c_str(),
                                     config_.output_filename.c_str(),
                                     config_.codec_settings.width,
                                     config_.codec_settings.height, &psnr_result,
                                     &ssim_result));
@@ skipping 148 matching lines @@
 }
 
 // For every encoded frame, update the rate control metrics.
 void VideoProcessorIntegrationTest::UpdateRateControlMetrics(int frame_number) {
   RTC_CHECK_GE(frame_number, 0);
 
   const int tl_idx = TemporalLayerIndexForFrame(frame_number);
   ++num_frames_per_update_[tl_idx];
   ++num_frames_total_;
 
-  FrameType frame_type = stats_.stats_[frame_number].frame_type;
+  const FrameStatistic* frame_stat = stats_.GetFrame(frame_number);
+  FrameType frame_type = frame_stat->frame_type;
   float encoded_size_kbits =
-      stats_.stats_[frame_number].encoded_frame_length_in_bytes * 8.0f /
-      1000.0f;
+      frame_stat->encoded_frame_size_bytes * 8.0f / 1000.0f;
 
   // Update layer data.
   // Update rate mismatch relative to per-frame bandwidth for delta frames.
   if (frame_type == kVideoFrameDelta) {
     // TODO(marpan): Should we count dropped (zero size) frames in mismatch?
     sum_frame_size_mismatch_[tl_idx] +=
         fabs(encoded_size_kbits - per_frame_bandwidth_[tl_idx]) /
         per_frame_bandwidth_[tl_idx];
   } else {
     float target_size = (frame_number == 0) ? target_size_key_frame_initial_
@@ skipping 190 matching lines @@
   perc_encoding_rate_mismatch_ = 0.0f;
   num_frames_to_hit_target_ =
       rate_profile.frame_index_rate_update[rate_update_index + 1];
   encoding_rate_within_target_ = false;
   sum_key_frame_size_mismatch_ = 0.0;
   num_key_frames_ = 0;
 }
 
 }  // namespace test
 }  // namespace webrtc