| Index: webrtc/call/bitrate_estimator_tests.cc
|
| diff --git a/webrtc/call/bitrate_estimator_tests.cc b/webrtc/call/bitrate_estimator_tests.cc
|
| index 4b24bbd5effea911f421ae2d0cded48d9735b866..50de542a6fae9a144d7dcda8aaef93d79ec1ad09 100644
|
| --- a/webrtc/call/bitrate_estimator_tests.cc
|
| +++ b/webrtc/call/bitrate_estimator_tests.cc
|
| @@ -190,7 +190,6 @@ class BitrateEstimatorTest : public test::CallTest {
|
| receive_config.voe_channel_id = 0;
|
| receive_config.rtp.extensions.push_back(
|
| RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId));
|
| - receive_config.combined_audio_video_bwe = true;
|
| audio_receive_stream_ =
|
| test_->receiver_call_->CreateAudioReceiveStream(receive_config);
|
| } else {
|
| @@ -273,17 +272,6 @@ TEST_F(BitrateEstimatorTest, InstantiatesTOFPerDefaultForVideo) {
|
| EXPECT_TRUE(receiver_log_.Wait());
|
| }
|
|
|
| -TEST_F(BitrateEstimatorTest, ImmediatelySwitchToASTForAudio) {
|
| - video_send_config_.rtp.extensions.push_back(
|
| - RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId));
|
| - receiver_log_.PushExpectedLogLine(kSingleStreamLog);
|
| - receiver_log_.PushExpectedLogLine(kSingleStreamLog);
|
| - receiver_log_.PushExpectedLogLine("Switching to absolute send time RBE.");
|
| - receiver_log_.PushExpectedLogLine(kAbsSendTimeLog);
|
| - streams_.push_back(new Stream(this, true));
|
| - EXPECT_TRUE(receiver_log_.Wait());
|
| -}
|
| -
|
| TEST_F(BitrateEstimatorTest, ImmediatelySwitchToASTForVideo) {
|
| video_send_config_.rtp.extensions.push_back(
|
| RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId));
|
| @@ -295,20 +283,6 @@ TEST_F(BitrateEstimatorTest, ImmediatelySwitchToASTForVideo) {
|
| EXPECT_TRUE(receiver_log_.Wait());
|
| }
|
|
|
| -TEST_F(BitrateEstimatorTest, SwitchesToASTForAudio) {
|
| - receiver_log_.PushExpectedLogLine(kSingleStreamLog);
|
| - receiver_log_.PushExpectedLogLine(kSingleStreamLog);
|
| - streams_.push_back(new Stream(this, true));
|
| - EXPECT_TRUE(receiver_log_.Wait());
|
| -
|
| - video_send_config_.rtp.extensions.push_back(
|
| - RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId));
|
| - receiver_log_.PushExpectedLogLine("Switching to absolute send time RBE.");
|
| - receiver_log_.PushExpectedLogLine(kAbsSendTimeLog);
|
| - streams_.push_back(new Stream(this, true));
|
| - EXPECT_TRUE(receiver_log_.Wait());
|
| -}
|
| -
|
| TEST_F(BitrateEstimatorTest, SwitchesToASTForVideo) {
|
| video_send_config_.rtp.extensions.push_back(
|
| RtpExtension(RtpExtension::kTOffset, kTOFExtensionId));
|
|
|