From 669ea1917e4d2b7d64d3fe204b837bae724313c7 Mon Sep 17 00:00:00 2001 From: brandtr Date: Mon, 7 Aug 2017 03:35:13 -0700 Subject: [PATCH] Rename WEBRTC_VIDEOPROCESSOR_H264_TESTS define to WEBRTC_USE_H264. This is the name used in other parts of the code. BUG=none Review-Url: https://codereview.webrtc.org/2996463003 Cr-Commit-Position: refs/heads/master@{#19253} --- webrtc/modules/video_coding/BUILD.gn | 2 +- .../video_coding/codecs/h264/test/h264_impl_unittest.cc | 2 +- .../codecs/test/videoprocessor_integrationtest.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn index 8ff2bcbe63..bdf5baddcf 100644 --- a/webrtc/modules/video_coding/BUILD.gn +++ b/webrtc/modules/video_coding/BUILD.gn @@ -436,7 +436,7 @@ if (rtc_include_tests) { ] if (rtc_use_h264) { - defines = [ "WEBRTC_VIDEOPROCESSOR_H264_TESTS" ] + defines = [ "WEBRTC_USE_H264" ] } if (!build_with_chromium && is_clang) { diff --git a/webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc b/webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc index 9db694e56b..806b5ac06b 100644 --- a/webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc +++ b/webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc @@ -32,7 +32,7 @@ class TestH264Impl : public VideoCodecTest { } }; -#ifdef WEBRTC_VIDEOPROCESSOR_H264_TESTS +#ifdef WEBRTC_USE_H264 #define MAYBE_EncodeDecode EncodeDecode #define MAYBE_DecodedQpEqualsEncodedQp DecodedQpEqualsEncodedQp #else diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc index 0fa595b7ca..64708dc802 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc @@ -33,7 +33,7 @@ const char kForemanCif[] = "foreman_cif"; } // namespace -#if defined(WEBRTC_VIDEOPROCESSOR_H264_TESTS) +#if defined(WEBRTC_USE_H264) // H264: Run with no packet loss and fixed bitrate. Quality should be very high. // Note(hbos): The PacketManipulatorImpl code used to simulate packet loss in @@ -60,7 +60,7 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossH264) { nullptr /* visualization_params */); } -#endif // defined(WEBRTC_VIDEOPROCESSOR_H264_TESTS) +#endif // defined(WEBRTC_USE_H264) // Fails on iOS. See webrtc:4755. #if !defined(WEBRTC_IOS)