Delete batch mode from 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 474 matching lines @@
         0.5 * kInitialBufferSize * bitrate_layer_[0];
     processor_->SetRates(bitrate_kbps_, framerate_);
 
     // Process each frame, up to |num_frames|.
     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.
+    while (frame_number < num_frames) {
+      processor_->ProcessFrame(frame_number);
+      VerifyQpParser(frame_number);
+      const int tl_idx = TemporalLayerIndexForFrame(frame_number);
+      ++num_frames_per_update_[tl_idx];
+      ++num_frames_total_;
+      UpdateRateControlMetrics(frame_number);
 
-      for (frame_number = 0; frame_number < num_frames; ++frame_number) {
-        processor_->ProcessFrame(frame_number);
-      }
+      ++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 {
-      // In online mode, we calculate the metrics for a given frame right after
-      // it has been sent for encoding.
+      // 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]) {
+        PrintAndMaybeVerifyRateControlMetrics(update_index, rc_thresholds);
 
-      if (config_.hw_codec) {
-        LOG(LS_WARNING) << "HW codecs should mostly be run in batch mode, "
-                           "since they may be pipelining.";
-      }
-
-      while (frame_number < num_frames) {
-        processor_->ProcessFrame(frame_number);
-        VerifyQpParser(frame_number);
-        const int tl_idx = TemporalLayerIndexForFrame(frame_number);
-        ++num_frames_per_update_[tl_idx];
-        ++num_frames_total_;
-        UpdateRateControlMetrics(frame_number);
-
-        ++frame_number;
-
-        // 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]) {
-          PrintAndMaybeVerifyRateControlMetrics(update_index, rc_thresholds);
-
-          // 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_);
-        }
+        // 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_);
       }
     }
 
-    // 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).
+    // Verify rate control metrics for all frames since the last rate update.
     PrintAndMaybeVerifyRateControlMetrics(update_index, rc_thresholds);
     EXPECT_EQ(num_frames, frame_number);
     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();
@@ skipping 27 matching lines @@
     if (remove(config_.output_filename.c_str()) < 0) {
       fprintf(stderr, "Failed to remove temporary file!\n");
     }
   }
 
   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) {
+                            bool verbose_logging) {
     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;
     config->use_single_core = use_single_core;
     config->verbose = verbose_logging;
     config->hw_codec = hw_codec;
-    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,
@@ skipping 107 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_