Merge "Merge upstream SHA 04cb763"android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-release

am: 9a337512d9

* commit '9a337512d97e37afc142dee4fd50a41b741a87d2': (797 commits)
  Add tests for verifying transport feedback for audio and video.
  Eliminate defines in talk/
  Revert of Update with new default boringssl no-aes cipher suites. Re-enable tests. (patchset #3 id:40001 of https://codereview.webrtc.org/1550773002/ )
  Remove assert which was incorrectly added to TcpPort::OnSentPacket.
  Reland Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket.
  Update with new default boringssl no-aes cipher suites. Re-enable tests.
  Revert of Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket. (patchset #3 id:40001 of https://codereview.webrtc.org/1577873003/ )
  Re-land: "Use an explicit identifier in Config"
  Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket.
  Revert of Delete remnants of non-square pixel support from cricket::VideoFrame. (patchset #1 id:1 of https://codereview.webrtc.org/1586613002/ )
  Remove libfuzzer trybot from default trybot set.
  Add ramp-up tests for transport sequence number with and w/o audio.
  Delete remnants of non-square pixel support from cricket::VideoFrame.
  Fix IPAddress::ToSensitiveString() to avoid dependency on inet_ntop().
  Revert of Storing raw audio sink for default audio track. (patchset #7 id:120001 of https://codereview.chromium.org/1551813002/ )
  Re-enable tests that failed under Linux_Msan.
  Revert of Use an explicit identifier in Config (patchset #4 id:60001 of https://codereview.webrtc.org/1538643004/ )
  Roll chromium_revision 346fea9..099be58 (369082:369139)
  Disable WebRtcVideoChannel2BaseTest.SendManyResizeOnce for TSan
  Add build_protobuf variable.
  ...

1 files changed, 0 insertions, 160 deletions

diff --git a/webrtc/modules/video_coding/main/source/jitter_estimator_tests.cc b/webrtc/modules/video_coding/main/source/jitter_estimator_tests.cc
deleted file mode 100644
index c69c4bcdad..0000000000
--- a/webrtc/modules/video_coding/main/source/jitter_estimator_tests.cc
+++ /dev/null
@@ -1,160 +0,0 @@
-/*  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "webrtc/modules/video_coding/main/source/jitter_estimator.h"
-
-#include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/system_wrappers/include/clock.h"
-
-namespace webrtc {
-
-class TestEstimator : public VCMJitterEstimator {
- public:
-  explicit TestEstimator(bool exp_enabled)
-      : VCMJitterEstimator(&fake_clock_, 0, 0),
-        fake_clock_(0),
-        exp_enabled_(exp_enabled) {}
-
-  virtual bool LowRateExperimentEnabled() { return exp_enabled_; }
-
-  void AdvanceClock(int64_t microseconds) {
-    fake_clock_.AdvanceTimeMicroseconds(microseconds);
-  }
-
- private:
-  SimulatedClock fake_clock_;
-  const bool exp_enabled_;
-};
-
-class TestVCMJitterEstimator : public ::testing::Test {
- protected:
-  TestVCMJitterEstimator()
-      : regular_estimator_(false), low_rate_estimator_(true) {}
-
-  virtual void SetUp() { regular_estimator_.Reset(); }
-
-  TestEstimator regular_estimator_;
-  TestEstimator low_rate_estimator_;
-};
-
-// Generates some simple test data in the form of a sawtooth wave.
-class ValueGenerator {
- public:
-  ValueGenerator(int32_t amplitude) : amplitude_(amplitude), counter_(0) {}
-  virtual ~ValueGenerator() {}
-
-  int64_t Delay() { return ((counter_ % 11) - 5) * amplitude_; }
-
-  uint32_t FrameSize() { return 1000 + Delay(); }
-
-  void Advance() { ++counter_; }
-
- private:
-  const int32_t amplitude_;
-  int64_t counter_;
-};
-
-// 5 fps, disable jitter delay altogether.
-TEST_F(TestVCMJitterEstimator, TestLowRate) {
-  ValueGenerator gen(10);
-  uint64_t time_delta = 1000000 / 5;
-  for (int i = 0; i < 60; ++i) {
-    regular_estimator_.UpdateEstimate(gen.Delay(), gen.FrameSize());
-    regular_estimator_.AdvanceClock(time_delta);
-    low_rate_estimator_.UpdateEstimate(gen.Delay(), gen.FrameSize());
-    low_rate_estimator_.AdvanceClock(time_delta);
-    EXPECT_GT(regular_estimator_.GetJitterEstimate(0), 0);
-    if (i > 2)
-      EXPECT_EQ(low_rate_estimator_.GetJitterEstimate(0), 0);
-    gen.Advance();
-  }
-}
-
-// 8 fps, steady state estimate should be in interpolated interval between 0
-// and value of previous method.
-TEST_F(TestVCMJitterEstimator, TestMidRate) {
-  ValueGenerator gen(10);
-  uint64_t time_delta = 1000000 / 8;
-  for (int i = 0; i < 60; ++i) {
-    regular_estimator_.UpdateEstimate(gen.Delay(), gen.FrameSize());
-    regular_estimator_.AdvanceClock(time_delta);
-    low_rate_estimator_.UpdateEstimate(gen.Delay(), gen.FrameSize());
-    low_rate_estimator_.AdvanceClock(time_delta);
-    EXPECT_GT(regular_estimator_.GetJitterEstimate(0), 0);
-    EXPECT_GT(low_rate_estimator_.GetJitterEstimate(0), 0);
-    EXPECT_GE(regular_estimator_.GetJitterEstimate(0),
-              low_rate_estimator_.GetJitterEstimate(0));
-    gen.Advance();
-  }
-}
-
-// 30 fps, steady state estimate should be same as previous method.
-TEST_F(TestVCMJitterEstimator, TestHighRate) {
-  ValueGenerator gen(10);
-  uint64_t time_delta = 1000000 / 30;
-  for (int i = 0; i < 60; ++i) {
-    regular_estimator_.UpdateEstimate(gen.Delay(), gen.FrameSize());
-    regular_estimator_.AdvanceClock(time_delta);
-    low_rate_estimator_.UpdateEstimate(gen.Delay(), gen.FrameSize());
-    low_rate_estimator_.AdvanceClock(time_delta);
-    EXPECT_EQ(regular_estimator_.GetJitterEstimate(0),
-              low_rate_estimator_.GetJitterEstimate(0));
-    gen.Advance();
-  }
-}
-
-// 10 fps, high jitter then low jitter. Low rate estimator should converge
-// faster to low noise estimate.
-TEST_F(TestVCMJitterEstimator, TestConvergence) {
-  // Reach a steady state with high noise.
-  ValueGenerator gen(50);
-  uint64_t time_delta = 1000000 / 10;
-  for (int i = 0; i < 100; ++i) {
-    regular_estimator_.UpdateEstimate(gen.Delay(), gen.FrameSize());
-    regular_estimator_.AdvanceClock(time_delta * 2);
-    low_rate_estimator_.UpdateEstimate(gen.Delay(), gen.FrameSize());
-    low_rate_estimator_.AdvanceClock(time_delta * 2);
-    gen.Advance();
-  }
-
-  int threshold = regular_estimator_.GetJitterEstimate(0) / 2;
-
-  // New generator with zero noise.
-  ValueGenerator low_gen(0);
-  int regular_iterations = 0;
-  int low_rate_iterations = 0;
-  for (int i = 0; i < 500; ++i) {
-    if (regular_iterations == 0) {
-      regular_estimator_.UpdateEstimate(low_gen.Delay(), low_gen.FrameSize());
-      regular_estimator_.AdvanceClock(time_delta);
-      if (regular_estimator_.GetJitterEstimate(0) < threshold) {
-        regular_iterations = i;
-      }
-    }
-
-    if (low_rate_iterations == 0) {
-      low_rate_estimator_.UpdateEstimate(low_gen.Delay(), low_gen.FrameSize());
-      low_rate_estimator_.AdvanceClock(time_delta);
-      if (low_rate_estimator_.GetJitterEstimate(0) < threshold) {
-        low_rate_iterations = i;
-      }
-    }
-
-    if (regular_iterations != 0 && low_rate_iterations != 0) {
-      break;
-    }
-
-    gen.Advance();
-  }
-
-  EXPECT_NE(regular_iterations, 0);
-  EXPECT_NE(low_rate_iterations, 0);
-  EXPECT_LE(low_rate_iterations, regular_iterations);
-}
-}