Change frame bookkeeping in VideoProcessorIntegrationTest.

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 482 matching lines @@
     int frame_number = 0;
     int update_index = 0;
     int num_frames = rate_profile.num_frames;
     ResetRateControlMetrics(
         rate_profile.frame_index_rate_update[update_index + 1]);
 
     if (config_.batch_mode) {
       // In batch mode, we calculate the metrics for all frames after all frames
       // have been sent for encoding.
 
-      // TODO(brandtr): Refactor "frame number accounting" so we don't have to
-      // call ProcessFrame num_frames+1 times here.
-      for (frame_number = 0; frame_number <= num_frames; ++frame_number) {
+      for (frame_number = 0; frame_number < num_frames; ++frame_number) {
         processor_->ProcessFrame(frame_number);
       }
 
       for (frame_number = 0; frame_number < num_frames; ++frame_number) {
         const int tl_idx = TemporalLayerIndexForFrame(frame_number);
         ++num_frames_per_update_[tl_idx];
         ++num_frames_total_;
         UpdateRateControlMetrics(frame_number);
       }
     } else {
@@ skipping 24 matching lines @@
           // Update layer rates and the codec with new rates.
           ++update_index;
           bitrate_kbps_ = rate_profile.target_bit_rate[update_index];
           framerate_ = rate_profile.input_frame_rate[update_index];
           SetTemporalLayerRates();
           ResetRateControlMetrics(
               rate_profile.frame_index_rate_update[update_index + 1]);
           processor_->SetRates(bitrate_kbps_, framerate_);
         }
       }
-      // TODO(brandtr): Refactor "frame number accounting" so we don't have to
-      // call ProcessFrame one extra time here.
-      processor_->ProcessFrame(frame_number);
     }
 
     // Verify rate control metrics for all frames (if in batch mode), or for all
     // frames since the last rate update (if not in batch mode).
     PrintAndMaybeVerifyRateControlMetrics(update_index, rc_thresholds);
     EXPECT_EQ(num_frames, frame_number);
-    EXPECT_EQ(num_frames + 1, static_cast<int>(stats_.stats_.size()));
+    EXPECT_EQ(num_frames, static_cast<int>(stats_.stats_.size()));
 
     // Release encoder and decoder to make sure they have finished processing.
     processor_->Release();
     DestroyEncoderAndDecoder();
 
     // Close the analysis files before we use them for SSIM/PSNR calculations.
     analysis_frame_reader_->Close();
     analysis_frame_writer_->Close();
 
     // Close visualization files.
@@ skipping 163 matching lines @@
   float target_size_key_frame_initial_;
   float target_size_key_frame_;
   float sum_key_frame_size_mismatch_;
   int num_key_frames_;
 };
 
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_INTEGRATIONTEST_H_