Index: webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc |
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc |
index cbc251896de0cc9cf762b6b2d6e05de44cbbd97f..5d54caa75337834072919a6fe8410a6a2c04aeec 100644 |
--- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc |
+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc |
@@ -71,8 +71,7 @@ int NumberOfTemporalLayers(const VideoCodec& codec_settings) { |
} // namespace |
VideoProcessorIntegrationTest::VideoProcessorIntegrationTest() { |
-#if defined(WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED) && \ |
- defined(WEBRTC_ANDROID) |
+#if defined(WEBRTC_ANDROID) |
InitializeAndroidObjects(); |
#endif |
} |
@@ -276,7 +275,6 @@ void VideoProcessorIntegrationTest::ProcessFramesAndMaybeVerify( |
void VideoProcessorIntegrationTest::CreateEncoderAndDecoder() { |
std::unique_ptr<cricket::WebRtcVideoEncoderFactory> encoder_factory; |
if (config_.hw_encoder) { |
-#if defined(WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED) |
#if defined(WEBRTC_ANDROID) |
encoder_factory.reset(new jni::MediaCodecVideoEncoderFactory()); |
#elif defined(WEBRTC_IOS) |
@@ -286,13 +284,11 @@ void VideoProcessorIntegrationTest::CreateEncoderAndDecoder() { |
#else |
RTC_NOTREACHED() << "Only support HW encoder on Android and iOS."; |
#endif |
-#endif // WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED |
} else { |
encoder_factory.reset(new cricket::InternalEncoderFactory()); |
} |
if (config_.hw_decoder) { |
-#if defined(WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED) |
#if defined(WEBRTC_ANDROID) |
decoder_factory_.reset(new jni::MediaCodecVideoDecoderFactory()); |
#elif defined(WEBRTC_IOS) |
@@ -302,7 +298,6 @@ void VideoProcessorIntegrationTest::CreateEncoderAndDecoder() { |
#else |
RTC_NOTREACHED() << "Only support HW decoder on Android and iOS."; |
#endif |
-#endif // WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED |
} else { |
decoder_factory_.reset(new cricket::InternalDecoderFactory()); |
} |