Fix VideoProcessorIntegrationTest on iOS.

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 171 matching lines @@
   });
 
   // Process all frames.
   int frame_number = 0;
   const int num_frames = rate_profile.num_frames;
   RTC_DCHECK_GE(num_frames, 1);
   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 defined(WEBRTC_ANDROID)
     if (config_.hw_encoder || config_.hw_decoder) {
       SleepMs(rtc::kNumMillisecsPerSec /
               rate_profile.input_frame_rate[rate_update_index]);
     }
+#endif
 
     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],
@@ skipping 88 matching lines @@
     EXPECT_EQ(kVideoCodecH264, config_.codec_settings.codecType)
         << "iOS HW codecs only support H264.";
     decoder_factory_ = CreateObjCDecoderFactory();
 #else
     RTC_NOTREACHED() << "Only support HW decoder on Android and iOS.";
 #endif
   } else {
     decoder_factory_.reset(new cricket::InternalDecoderFactory());
   }
 
-  cricket::VideoCodec encoder_codec;
+  cricket::VideoCodec codec;
+  cricket::VideoDecoderParams decoder_params;  // Empty.
   switch (config_.codec_settings.codecType) {
     case kVideoCodecVP8:
-      encoder_codec = cricket::VideoCodec(cricket::kVp8CodecName);
-      encoder_.reset(encoder_factory->CreateVideoEncoder(encoder_codec));
-      decoder_ = decoder_factory_->CreateVideoDecoder(kVideoCodecVP8);
+      codec = cricket::VideoCodec(cricket::kVp8CodecName);
+      encoder_.reset(encoder_factory->CreateVideoEncoder(codec));
+      decoder_ =
+          decoder_factory_->CreateVideoDecoderWithParams(codec, decoder_params);
       break;
     case kVideoCodecVP9:
-      encoder_codec = cricket::VideoCodec(cricket::kVp9CodecName);
-      encoder_.reset(encoder_factory->CreateVideoEncoder(encoder_codec));
-      decoder_ = decoder_factory_->CreateVideoDecoder(kVideoCodecVP9);
+      codec = cricket::VideoCodec(cricket::kVp9CodecName);
+      encoder_.reset(encoder_factory->CreateVideoEncoder(codec));
+      decoder_ =
+          decoder_factory_->CreateVideoDecoderWithParams(codec, decoder_params);
       break;
     case kVideoCodecH264:
       // TODO(brandtr): Generalize so that we support multiple profiles here.
-      encoder_codec = cricket::VideoCodec(cricket::kH264CodecName);
-      encoder_.reset(encoder_factory->CreateVideoEncoder(encoder_codec));
-      decoder_ = decoder_factory_->CreateVideoDecoder(kVideoCodecH264);
+      codec = cricket::VideoCodec(cricket::kH264CodecName);
+      encoder_.reset(encoder_factory->CreateVideoEncoder(codec));
+      decoder_ =
+          decoder_factory_->CreateVideoDecoderWithParams(codec, decoder_params);
       break;
     default:
       RTC_NOTREACHED();
       break;
   }
 
   if (config_.sw_fallback_encoder) {
     encoder_ = rtc::MakeUnique<VideoEncoderSoftwareFallbackWrapper>(
-        encoder_codec, std::move(encoder_));
+        codec, std::move(encoder_));
   }
 
   EXPECT_TRUE(encoder_) << "Encoder not successfully created.";
   EXPECT_TRUE(decoder_) << "Decoder not successfully created.";
 }
 
 void VideoProcessorIntegrationTest::DestroyEncoderAndDecoder() {
   encoder_.reset();
   decoder_factory_->DestroyVideoDecoder(decoder_);
 }
@@ skipping 302 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