admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use correct define in H264 end-to-end tests.

Browse Source 
Right now, the H264 end-to-end tests are not run on the bots.

BUG=None

Review-Url: https://codereview.webrtc.org/2484913007
Cr-Commit-Position: refs/heads/master@{#15062}
This commit is contained in:
brandtr 2016-11-14 04:11:23 -08:00 committed by Commit bot
parent 8e75a523c8
commit 445fb8fa4f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/video/BUILD.gn
View File

@ -170,5 +170,8 @@ if (rtc_include_tests) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
if (rtc_use_h264) {
defines = [ "WEBRTC_USE_H264" ]
}
}
}

6
webrtc/video/end_to_end_tests.cc
View File

@ -375,8 +375,7 @@ TEST_F(EndToEndTest, SendsAndReceivesVP9VideoRotation90) {
}
#endif // !defined(RTC_DISABLE_VP9)
#if defined(WEBRTC_END_TO_END_H264_TESTS)
#if defined(WEBRTC_USE_H264)
TEST_F(EndToEndTest, SendsAndReceivesH264) {
CodecObserver test(500, kVideoRotation_0, "H264",
VideoEncoder::Create(VideoEncoder::kH264),
@ -390,8 +389,7 @@ TEST_F(EndToEndTest, SendsAndReceivesH264VideoRotation90) {
H264Decoder::Create());
RunBaseTest(&test);
}
#endif // defined(WEBRTC_END_TO_END_H264_TESTS)
#endif // defined(WEBRTC_USE_H264)
TEST_F(EndToEndTest, ReceiverUsesLocalSsrc) {
class SyncRtcpObserver : public test::EndToEndTest {