Remove codec setting members in VideoProcessorIntegrationTest. Use settings in CodecConfigPars dire…

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 124 matching lines @@
     InitializeAndroidObjects();
 
     external_encoder_factory_.reset(
         new webrtc_jni::MediaCodecVideoEncoderFactory());
     external_decoder_factory_.reset(
         new webrtc_jni::MediaCodecVideoDecoderFactory());
 #endif
   }
   virtual ~VideoProcessorIntegrationTest() = default;
 
-  void SetUpCodecConfig(const std::string& filename,
-                        int width,
-                        int height,
-                        bool verbose_logging) {
-    if (hw_codec_) {
+  void SetUpCodecConfig(const CodecConfigPars& process) {
+    if (process.hw_codec) {
 #if defined(WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED)
 #if defined(WEBRTC_ANDROID)
       // In general, external codecs should be destroyed by the factories that
       // allocated them. For the particular case of the Android
       // MediaCodecVideo{En,De}coderFactory's, however, it turns out that it is
       // fine for the std::unique_ptr to destroy the owned codec directly.
-      if (codec_type_ == kVideoCodecH264) {
+      if (process.codec_type == kVideoCodecH264) {

[sprang_webrtc, 2017/02/21 15:21:35]

While you're here, can you switch (ehm) this to a switch statement instead of
if/else?

[åsapersson, 2017/02/21 15:49:33]

Done.

         encoder_.reset(external_encoder_factory_->CreateVideoEncoder(
             cricket::VideoCodec(cricket::kH264CodecName)));
         decoder_.reset(
             external_decoder_factory_->CreateVideoDecoder(kVideoCodecH264));
-      } else if (codec_type_ == kVideoCodecVP8) {
+      } else if (process.codec_type == kVideoCodecVP8) {
         encoder_.reset(external_encoder_factory_->CreateVideoEncoder(
             cricket::VideoCodec(cricket::kVp8CodecName)));
         decoder_.reset(
             external_decoder_factory_->CreateVideoDecoder(kVideoCodecVP8));
-      } else if (codec_type_ == kVideoCodecVP9) {
+      } else if (process.codec_type == kVideoCodecVP9) {
         encoder_.reset(external_encoder_factory_->CreateVideoEncoder(
             cricket::VideoCodec(cricket::kVp9CodecName)));
         decoder_.reset(
             external_decoder_factory_->CreateVideoDecoder(kVideoCodecVP9));
       }
 #elif defined(WEBRTC_IOS)
-      RTC_DCHECK_EQ(kVideoCodecH264, codec_type_)
+      RTC_DCHECK_EQ(kVideoCodecH264, process.codec_type)
           << "iOS HW codecs only support H264.";
       encoder_.reset(new H264VideoToolboxEncoder(
           cricket::VideoCodec(cricket::kH264CodecName)));
       decoder_.reset(new H264VideoToolboxDecoder());
 #else
       RTC_NOTREACHED() << "Only support HW codecs on Android and iOS.";
 #endif
 #endif  // WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED
       RTC_DCHECK(encoder_) << "HW encoder not successfully created.";
       RTC_DCHECK(decoder_) << "HW decoder not successfully created.";
     } else {
       // SW codecs.
-      if (codec_type_ == kVideoCodecH264) {
+      if (process.codec_type == kVideoCodecH264) {

[sprang_webrtc, 2017/02/21 15:21:35]

dito

[åsapersson, 2017/02/21 15:49:33]

Done.

         encoder_.reset(
             H264Encoder::Create(cricket::VideoCodec(cricket::kH264CodecName)));
         decoder_.reset(H264Decoder::Create());
-      } else if (codec_type_ == kVideoCodecVP8) {
+      } else if (process.codec_type == kVideoCodecVP8) {
         encoder_.reset(VP8Encoder::Create());
         decoder_.reset(VP8Decoder::Create());
-      } else if (codec_type_ == kVideoCodecVP9) {
+      } else if (process.codec_type == kVideoCodecVP9) {
         encoder_.reset(VP9Encoder::Create());
         decoder_.reset(VP9Decoder::Create());
       }
     }
 
-    VideoCodingModule::Codec(codec_type_, &codec_settings_);
+    VideoCodingModule::Codec(process.codec_type, &codec_settings_);
 
     // Configure input filename.
-    config_.input_filename = test::ResourcePath(filename, "yuv");
-    if (verbose_logging)
-      printf("Filename: %s\n", filename.c_str());
+    config_.input_filename = test::ResourcePath(process.filename, "yuv");
+    if (process.verbose_logging)
+      printf("Filename: %s\n", process.filename.c_str());
     // Generate an output filename in a safe way.
     config_.output_filename = test::TempFilename(
         test::OutputPath(), "videoprocessor_integrationtest");
-    config_.frame_length_in_bytes = CalcBufferSize(kI420, width, height);
-    config_.verbose = verbose_logging;
+    config_.frame_length_in_bytes =
+        CalcBufferSize(kI420, process.width, process.height);
+    config_.verbose = process.verbose_logging;
     // Only allow encoder/decoder to use single core, for predictability.
     config_.use_single_core = true;
     // Key frame interval and packet loss are set for each test.
-    config_.keyframe_interval = key_frame_interval_;
+    config_.keyframe_interval = process.key_frame_interval;
     config_.networking_config.packet_loss_probability = packet_loss_;
 
     // Configure codec settings.
     config_.codec_settings = &codec_settings_;
     config_.codec_settings->startBitrate = start_bitrate_;
-    config_.codec_settings->width = width;
-    config_.codec_settings->height = height;
+    config_.codec_settings->width = process.width;
+    config_.codec_settings->height = process.height;
 
     // These features may be set depending on the test.
     switch (config_.codec_settings->codecType) {
       case kVideoCodecH264:
-        config_.codec_settings->H264()->frameDroppingOn = frame_dropper_on_;
+        config_.codec_settings->H264()->frameDroppingOn =
+            process.frame_dropper_on;
         config_.codec_settings->H264()->keyFrameInterval =
             kBaseKeyFrameInterval;
         break;
       case kVideoCodecVP8:
         config_.codec_settings->VP8()->errorConcealmentOn =
-            error_concealment_on_;
-        config_.codec_settings->VP8()->denoisingOn = denoising_on_;
+            process.error_concealment_on;
+        config_.codec_settings->VP8()->denoisingOn = process.denoising_on;
         config_.codec_settings->VP8()->numberOfTemporalLayers =
             num_temporal_layers_;
-        config_.codec_settings->VP8()->frameDroppingOn = frame_dropper_on_;
-        config_.codec_settings->VP8()->automaticResizeOn = spatial_resize_on_;
+        config_.codec_settings->VP8()->frameDroppingOn =
+            process.frame_dropper_on;
+        config_.codec_settings->VP8()->automaticResizeOn =
+            process.spatial_resize_on;
         config_.codec_settings->VP8()->keyFrameInterval = kBaseKeyFrameInterval;
         break;
       case kVideoCodecVP9:
-        config_.codec_settings->VP9()->denoisingOn = denoising_on_;
+        config_.codec_settings->VP9()->denoisingOn = process.denoising_on;
         config_.codec_settings->VP9()->numberOfTemporalLayers =
             num_temporal_layers_;
-        config_.codec_settings->VP9()->frameDroppingOn = frame_dropper_on_;
-        config_.codec_settings->VP9()->automaticResizeOn = spatial_resize_on_;
+        config_.codec_settings->VP9()->frameDroppingOn =
+            process.frame_dropper_on;
+        config_.codec_settings->VP9()->automaticResizeOn =
+            process.spatial_resize_on;
         config_.codec_settings->VP9()->keyFrameInterval = kBaseKeyFrameInterval;
         break;
       default:
         RTC_NOTREACHED();
         break;
     }
     frame_reader_.reset(new test::FrameReaderImpl(
         config_.input_filename, config_.codec_settings->width,
         config_.codec_settings->height));
     frame_writer_.reset(new test::FrameWriterImpl(
@@ skipping 186 matching lines @@
       frame_rate_layer_[2] = frame_rate_ / 2.0f;
     }
   }
 
   // Processes all frames in the clip and verifies the result.
   void ProcessFramesAndVerify(QualityMetrics quality_metrics,
                               RateProfile rate_profile,
                               CodecConfigPars process,
                               RateControlMetrics* rc_metrics) {
     // Codec/config settings.
-    codec_type_ = process.codec_type;
-    hw_codec_ = process.hw_codec;
     start_bitrate_ = rate_profile.target_bit_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;
-    denoising_on_ = process.denoising_on;
-    frame_dropper_on_ = process.frame_dropper_on;
-    spatial_resize_on_ = process.spatial_resize_on;
-    SetUpCodecConfig(process.filename, process.width, process.height,
-                     process.verbose_logging);
+    SetUpCodecConfig(process);
     // Update the layers and the codec with the initial rates.
     bit_rate_ = rate_profile.target_bit_rate[0];
     frame_rate_ = rate_profile.input_frame_rate[0];
     SetLayerRates();
     // Set the initial target size for key frame.
     target_size_key_frame_initial_ =
         0.5 * kInitialBufferSize * bit_rate_layer_[0];
     processor_->SetRates(bit_rate_, frame_rate_);
 
     // Process each frame, up to |num_frames|.
@@ skipping 198 matching lines @@
   int bit_rate_;
   int frame_rate_;
   int layer_;
   float target_size_key_frame_initial_;
   float target_size_key_frame_;
   float sum_key_frame_size_mismatch_;
   int num_key_frames_;
   float start_bitrate_;
 
   // Codec and network settings.
-  VideoCodecType codec_type_;
-  bool hw_codec_;
   float packet_loss_;
   int num_temporal_layers_;
-  int key_frame_interval_;
-  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_