From a7e48442984e22ebea9c27f7b28b29c69dfaa808 Mon Sep 17 00:00:00 2001 From: Rasmus Brandt Date: Mon, 14 May 2018 17:11:49 +0200 Subject: [PATCH] Move H.264 codec test activation directly behind build flag. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I5dd366aba16b440a8e99826e116db0d6b68bf844 Reviewed-on: https://webrtc-review.googlesource.com/76621 Reviewed-by: Åsa Persson Commit-Queue: Rasmus Brandt Cr-Commit-Position: refs/heads/master@{#23231} --- modules/video_coding/BUILD.gn | 8 +++----- .../video_coding/codecs/test/videocodec_test_openh264.cc | 4 ---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index c6e30a5821..12ded47322 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -715,11 +715,13 @@ if (rtc_include_tests) { "codecs/multiplex/test/multiplex_adapter_unittest.cc", "codecs/test/video_encoder_decoder_instantiation_tests.cc", "codecs/test/videocodec_test_libvpx.cc", - "codecs/test/videocodec_test_openh264.cc", "codecs/test/videocodec_test_parameterized.cc", "codecs/vp8/test/vp8_impl_unittest.cc", "codecs/vp9/test/vp9_impl_unittest.cc", ] + if (rtc_use_h264) { + sources += [ "codecs/test/videocodec_test_openh264.cc" ] + } deps = [ ":video_codecs_test_framework", @@ -765,10 +767,6 @@ if (rtc_include_tests) { } } - if (rtc_use_h264) { - defines = [ "WEBRTC_USE_H264" ] - } - if (!build_with_chromium && is_clang) { # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] diff --git a/modules/video_coding/codecs/test/videocodec_test_openh264.cc b/modules/video_coding/codecs/test/videocodec_test_openh264.cc index 2bfd12fdff..682e4745e6 100644 --- a/modules/video_coding/codecs/test/videocodec_test_openh264.cc +++ b/modules/video_coding/codecs/test/videocodec_test_openh264.cc @@ -19,8 +19,6 @@ namespace webrtc { namespace test { -#if defined(WEBRTC_USE_H264) - namespace { // Codec settings. const int kCifWidth = 352; @@ -87,7 +85,5 @@ TEST(VideoProcessorIntegrationTestOpenH264, SingleNalUnit) { &bs_thresholds, nullptr); } -#endif // defined(WEBRTC_USE_H264) - } // namespace test } // namespace webrtc