zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move H.264 codec test activation directly behind build flag.

Browse Source 
Bug: None
Change-Id: I5dd366aba16b440a8e99826e116db0d6b68bf844
Reviewed-on: https://webrtc-review.googlesource.com/76621
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23231}
This commit is contained in:
Rasmus Brandt
2018-05-14 17:11:49 +02:00
committed by Commit Bot
parent 8a483be137
commit a7e4844298
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/video_coding/BUILD.gn
View File

@ -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" ]

4
modules/video_coding/codecs/test/videocodec_test_openh264.cc
View File

@ -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