Roll chromium_revision 5e821a778b..5c22c2afac (432715:434448)
Manual changes needed to use our own test runner for Android tests. VideoProcessorIntegrationTest.ProcessNoLossChangeFrameRateFrameDropVP9 is failing for TSan and UBSan configs, so disable the test for them here. Change log:5e821a778b..5c22c2afacFull diff:5e821a778b..5c22c2afacChanged dependencies: * src/buildtools:1f985091a5..991f459071* src/third_party/android_tools: https://chromium.googlesource.com/android_tools.git/+log/c02a002b48..811a2c3f91 * src/third_party/catapult:249cfbcd88..671a654736* src/third_party/ffmpeg:3c7a098821..d16162e3f4* src/third_party/icu:7ddf5e9ba1..dda089a98a* src/third_party/libvpx/source/libvpx:5c64c01c7c..d7f1d60c51* src/third_party/openmax_dl:57d33bee78..7acede9c03DEPS diff:5e821a778b..5c22c2afac/DEPS Clang version changed 284979:287780 Details:5e821a778b..5c22c2afac/tools/clang/scripts/update.py TBR=marpan@webrtc.org, ehmaldonado@webrtc.org BUG=webrtc:6775, webrtc:6739, webrtc:6781 NOTRY=True Review-Url: https://codereview.webrtc.org/2533733002 Cr-Commit-Position: refs/heads/master@{#15256}
This commit is contained in:
parent
deb95f32f4
commit
847f6897f2
2
DEPS
2
DEPS
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
vars = {
|
vars = {
|
||||||
'chromium_git': 'https://chromium.googlesource.com',
|
'chromium_git': 'https://chromium.googlesource.com',
|
||||||
'chromium_revision': '5e821a778b85878bafcc8128f64333fd518c79a5',
|
'chromium_revision': '5c22c2afacd399b830795330efff38f07f0c4bec',
|
||||||
}
|
}
|
||||||
|
|
||||||
deps = {
|
deps = {
|
||||||
|
|||||||
@ -39,3 +39,5 @@ ignore_elf32_limitations = true
|
|||||||
# Use system Xcode installation instead of the Chromium bundled Mac toolchain,
|
# Use system Xcode installation instead of the Chromium bundled Mac toolchain,
|
||||||
# since it contains only SDK 10.11, not 10.12 which WebRTC needs.
|
# since it contains only SDK 10.11, not 10.12 which WebRTC needs.
|
||||||
use_system_xcode = true
|
use_system_xcode = true
|
||||||
|
|
||||||
|
android_test_runner_script = "../../webrtc/build/android/test_runner.py"
|
||||||
|
|||||||
@ -770,5 +770,9 @@ if (is_android) {
|
|||||||
deps = [
|
deps = [
|
||||||
"//base:base_java",
|
"//base:base_java",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
data = [
|
||||||
|
"//webrtc/build/android/test_runner.py",
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -625,7 +625,14 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossH264) {
|
|||||||
// VP9: Run with no packet loss and fixed bitrate. Quality should be very high.
|
// VP9: Run with no packet loss and fixed bitrate. Quality should be very high.
|
||||||
// One key frame (first frame only) in sequence. Setting |key_frame_interval|
|
// One key frame (first frame only) in sequence. Setting |key_frame_interval|
|
||||||
// to -1 below means no periodic key frames in test.
|
// to -1 below means no periodic key frames in test.
|
||||||
TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossVP9) {
|
|
||||||
|
#if defined(THREAD_SANITIZER) || defined(UNDEFINED_SANITIZER)
|
||||||
|
// Fails on TSan and UBSan: https://bugs.webrtc.org/6781.
|
||||||
|
#define MAYBE_Process0PercentPacketLossVP9 DISABLED_Process0PercentPacketLossVP9
|
||||||
|
#else
|
||||||
|
#define MAYBE_Process0PercentPacketLossVP9 Process0PercentPacketLossVP9
|
||||||
|
#endif
|
||||||
|
TEST_F(VideoProcessorIntegrationTest, MAYBE_Process0PercentPacketLossVP9) {
|
||||||
// Bitrate and frame rate profile.
|
// Bitrate and frame rate profile.
|
||||||
RateProfile rate_profile;
|
RateProfile rate_profile;
|
||||||
SetRateProfilePars(&rate_profile, 0, 500, 30, 0);
|
SetRateProfilePars(&rate_profile, 0, 500, 30, 0);
|
||||||
@ -671,7 +678,14 @@ TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLossVP9) {
|
|||||||
// low to high to medium. Check that quality and encoder response to the new
|
// low to high to medium. Check that quality and encoder response to the new
|
||||||
// target rate/per-frame bandwidth (for each rate update) is within limits.
|
// target rate/per-frame bandwidth (for each rate update) is within limits.
|
||||||
// One key frame (first frame only) in sequence.
|
// One key frame (first frame only) in sequence.
|
||||||
TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) {
|
#if defined(THREAD_SANITIZER) || defined(UNDEFINED_SANITIZER)
|
||||||
|
// Fails on TSan and UBSan: https://bugs.webrtc.org/6781.
|
||||||
|
#define MAYBE_ProcessNoLossChangeBitRateVP9 \
|
||||||
|
DISABLED_ProcessNoLossChangeBitRateVP9
|
||||||
|
#else
|
||||||
|
#define MAYBE_ProcessNoLossChangeBitRateVP9 ProcessNoLossChangeBitRateVP9
|
||||||
|
#endif
|
||||||
|
TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossChangeBitRateVP9) {
|
||||||
// Bitrate and frame rate profile.
|
// Bitrate and frame rate profile.
|
||||||
RateProfile rate_profile;
|
RateProfile rate_profile;
|
||||||
SetRateProfilePars(&rate_profile, 0, 200, 30, 0);
|
SetRateProfilePars(&rate_profile, 0, 200, 30, 0);
|
||||||
@ -703,8 +717,10 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) {
|
|||||||
// Note: quality after update should be higher but we currently compute quality
|
// Note: quality after update should be higher but we currently compute quality
|
||||||
// metrics averaged over whole sequence run.
|
// metrics averaged over whole sequence run.
|
||||||
|
|
||||||
#if defined(WEBRTC_ANDROID)
|
#if defined(WEBRTC_ANDROID) || defined(THREAD_SANITIZER) || \
|
||||||
|
defined(UNDEFINED_SANITIZER)
|
||||||
// Flaky on Android: https://bugs.chromium.org/p/webrtc/issues/detail?id=6057.
|
// Flaky on Android: https://bugs.chromium.org/p/webrtc/issues/detail?id=6057.
|
||||||
|
// Fails on TSan and UBSan: https://bugs.webrtc.org/6781.
|
||||||
#define MAYBE_ProcessNoLossChangeFrameRateFrameDropVP9 \
|
#define MAYBE_ProcessNoLossChangeFrameRateFrameDropVP9 \
|
||||||
DISABLED_ProcessNoLossChangeFrameRateFrameDropVP9
|
DISABLED_ProcessNoLossChangeFrameRateFrameDropVP9
|
||||||
#else
|
#else
|
||||||
@ -738,7 +754,13 @@ TEST_F(VideoProcessorIntegrationTest,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// VP9: Run with no packet loss and denoiser on. One key frame (first frame).
|
// VP9: Run with no packet loss and denoiser on. One key frame (first frame).
|
||||||
TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) {
|
#if defined(THREAD_SANITIZER) || defined(UNDEFINED_SANITIZER)
|
||||||
|
// Fails on TSan and UBSan: https://bugs.webrtc.org/6781.
|
||||||
|
#define MAYBE_ProcessNoLossDenoiserOnVP9 DISABLED_ProcessNoLossDenoiserOnVP9
|
||||||
|
#else
|
||||||
|
#define MAYBE_ProcessNoLossDenoiserOnVP9 ProcessNoLossDenoiserOnVP9
|
||||||
|
#endif
|
||||||
|
TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossDenoiserOnVP9) {
|
||||||
// Bitrate and frame rate profile.
|
// Bitrate and frame rate profile.
|
||||||
RateProfile rate_profile;
|
RateProfile rate_profile;
|
||||||
SetRateProfilePars(&rate_profile, 0, 500, 30, 0);
|
SetRateProfilePars(&rate_profile, 0, 500, 30, 0);
|
||||||
@ -761,7 +783,16 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) {
|
|||||||
// Run with no packet loss, at low bitrate.
|
// Run with no packet loss, at low bitrate.
|
||||||
// spatial_resize is on, for this low bitrate expect one resize in sequence.
|
// spatial_resize is on, for this low bitrate expect one resize in sequence.
|
||||||
// Resize happens on delta frame. Expect only one key frame (first frame).
|
// Resize happens on delta frame. Expect only one key frame (first frame).
|
||||||
TEST_F(VideoProcessorIntegrationTest, ProcessNoLossSpatialResizeFrameDropVP9) {
|
#if defined(THREAD_SANITIZER) || defined(UNDEFINED_SANITIZER)
|
||||||
|
// Fails on TSan and UBSan: https://bugs.webrtc.org/6781.
|
||||||
|
#define MAYBE_ProcessNoLossSpatialResizeFrameDropVP9 \
|
||||||
|
DISABLED_ProcessNoLossSpatialResizeFrameDropVP9
|
||||||
|
#else
|
||||||
|
#define MAYBE_ProcessNoLossSpatialResizeFrameDropVP9 \
|
||||||
|
ProcessNoLossSpatialResizeFrameDropVP9
|
||||||
|
#endif
|
||||||
|
TEST_F(VideoProcessorIntegrationTest,
|
||||||
|
MAYBE_ProcessNoLossSpatialResizeFrameDropVP9) {
|
||||||
config_.networking_config.packet_loss_probability = 0;
|
config_.networking_config.packet_loss_probability = 0;
|
||||||
// Bitrate and frame rate profile.
|
// Bitrate and frame rate profile.
|
||||||
RateProfile rate_profile;
|
RateProfile rate_profile;
|
||||||
|
|||||||
@ -153,6 +153,9 @@ rtc_source_set("test_support") {
|
|||||||
|
|
||||||
if (is_android) {
|
if (is_android) {
|
||||||
deps += [ "//base:base" ]
|
deps += [ "//base:base" ]
|
||||||
|
data = [
|
||||||
|
"../build/android/test_runner.py",
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rtc_use_memcheck) {
|
if (rtc_use_memcheck) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user