Roll chromium_revision 4df108a..2a70cb1 (367307:367468)

Mac 32-bit support has been gone in Chromium for a long time, but was
removed in https://codereview.chromium.org/1557823002. This called
for finally removing our Mac 32-bit builds, which was done in
http://crbug.com/574320.

Change log: 4df108a..2a70cb1
Full diff: 4df108a..2a70cb1

Changed dependencies:
* src/third_party/libvpx_new/source/libvpx: ecb8dff..a9dd8a7
* src/third_party/nss: aee1b12..225bfc3
DEPS diff: 4df108a..2a70cb1/DEPS

No update to Clang.

TBR=marpan@webrtc.org, stefan@webrtc.org,
BUG=webrtc:5401, webrtc:5402
NOTRY=True

Review URL: https://codereview.webrtc.org/1556273002

Cr-Commit-Position: refs/heads/master@{#11159}
This commit is contained in:
kjellander
2016-01-06 22:12:27 -08:00
committed by Commit bot
parent 4f3c772015
commit 44cc795016
3 changed files with 30 additions and 3 deletions

View File

@ -652,6 +652,15 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) {
rc_metrics);
}
#if defined(WEBRTC_ANDROID)
// Fails on Android, see
// https://bugs.chromium.org/p/webrtc/issues/detail?id=5401
#define MAYBE_ProcessNoLossChangeFrameRateFrameDropVP9 \
DISABLED_ProcessNoLossChangeFrameRateFrameDropVP9
#else
#define MAYBE_ProcessNoLossChangeFrameRateFrameDropVP9 \
ProcessNoLossChangeFrameRateFrameDropVP9
#endif
// VP9: Run with no packet loss, with an update (decrease) in frame rate.
// Lower frame rate means higher per-frame-bandwidth, so easier to encode.
// At the low bitrate in this test, this means better rate control after the
@ -660,7 +669,7 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) {
// Note: quality after update should be higher but we currently compute quality
// metrics averaged over whole sequence run.
TEST_F(VideoProcessorIntegrationTest,
ProcessNoLossChangeFrameRateFrameDropVP9) {
MAYBE_ProcessNoLossChangeFrameRateFrameDropVP9) {
config_.networking_config.packet_loss_probability = 0;
// Bitrate and frame rate profile.
RateProfile rate_profile;
@ -706,10 +715,20 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) {
rc_metrics);
}
#if defined(WEBRTC_ANDROID)
// Fails on Android, see
// https://bugs.chromium.org/p/webrtc/issues/detail?id=5401
#define MAYBE_ProcessNoLossSpatialResizeFrameDropVP9 \
DISABLED_ProcessNoLossSpatialResizeFrameDropVP9
#else
#define MAYBE_ProcessNoLossSpatialResizeFrameDropVP9 \
ProcessNoLossSpatialResizeFrameDropVP9
#endif
// Run with no packet loss, at low bitrate.
// 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).
TEST_F(VideoProcessorIntegrationTest, ProcessNoLossSpatialResizeFrameDropVP9) {
TEST_F(VideoProcessorIntegrationTest,
MAYBE_ProcessNoLossSpatialResizeFrameDropVP9) {
config_.networking_config.packet_loss_probability = 0;
// Bitrate and frame rate profile.
RateProfile rate_profile;