Add send-side BWE to WebRtcVoiceEngine under a finch experiment.

webrtc/audio/audio_receive_stream_unittest.cc

 /*
  *  Copyright (c) 2015 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.
  */
 
@@ skipping 196 matching lines @@
 }
 }  // namespace
 
 TEST(AudioReceiveStreamTest, ConfigToString) {
   AudioReceiveStream::Config config;
   config.rtp.remote_ssrc = kRemoteSsrc;
   config.rtp.local_ssrc = kLocalSsrc;
   config.rtp.extensions.push_back(
       RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeId));
   config.voe_channel_id = kChannelId;
-  config.combined_audio_video_bwe = true;
   EXPECT_EQ(
       "{rtp: {remote_ssrc: 1234, local_ssrc: 5678, extensions: [{name: "
       "http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time, id: 2}]}, "
       "receive_transport: nullptr, rtcp_send_transport: nullptr, "
-      "voe_channel_id: 2, combined_audio_video_bwe: true}",
+      "voe_channel_id: 2}",
       config.ToString());
 }
 
 TEST(AudioReceiveStreamTest, ConstructDestruct) {
   ConfigHelper helper;
   internal::AudioReceiveStream recv_stream(
       helper.congestion_controller(), helper.config(), helper.audio_state());
 }
 
 MATCHER_P(VerifyHeaderExtension, expected_extension, "") {
   return arg.extension.hasAbsoluteSendTime ==
              expected_extension.hasAbsoluteSendTime &&
          arg.extension.absoluteSendTime ==
              expected_extension.absoluteSendTime &&
          arg.extension.hasTransportSequenceNumber ==
              expected_extension.hasTransportSequenceNumber &&
          arg.extension.transportSequenceNumber ==
              expected_extension.transportSequenceNumber;
 }
 
-TEST(AudioReceiveStreamTest, AudioPacketUpdatesBweWithTimestamp) {
-  ConfigHelper helper;
-  helper.config().combined_audio_video_bwe = true;
-  helper.SetupMockForBweFeedback(false);
-  internal::AudioReceiveStream recv_stream(
-      helper.congestion_controller(), helper.config(), helper.audio_state());
-  const int kAbsSendTimeValue = 1234;
-  std::vector<uint8_t> rtp_packet =
-      CreateRtpHeaderWithOneByteExtension(kAbsSendTimeId, kAbsSendTimeValue, 3);
-  PacketTime packet_time(5678000, 0);
-  const size_t kExpectedHeaderLength = 20;
-  RTPHeaderExtension expected_extension;
-  expected_extension.hasAbsoluteSendTime = true;
-  expected_extension.absoluteSendTime = kAbsSendTimeValue;
-  EXPECT_CALL(*helper.remote_bitrate_estimator(),
-              IncomingPacket(packet_time.timestamp / 1000,
-                             rtp_packet.size() - kExpectedHeaderLength,
-                             VerifyHeaderExtension(expected_extension), false))
-      .Times(1);
-  EXPECT_TRUE(
-      recv_stream.DeliverRtp(&rtp_packet[0], rtp_packet.size(), packet_time));
-}
-
 TEST(AudioReceiveStreamTest, AudioPacketUpdatesBweFeedback) {
   ConfigHelper helper;
-  helper.config().combined_audio_video_bwe = true;
   helper.config().rtp.transport_cc = true;
   helper.SetupMockForBweFeedback(true);
   internal::AudioReceiveStream recv_stream(
       helper.congestion_controller(), helper.config(), helper.audio_state());
   const int kTransportSequenceNumberValue = 1234;
   std::vector<uint8_t> rtp_packet = CreateRtpHeaderWithOneByteExtension(
       kTransportSequenceNumberId, kTransportSequenceNumberValue, 2);
   PacketTime packet_time(5678000, 0);
   const size_t kExpectedHeaderLength = 20;
   RTPHeaderExtension expected_extension;
@@ skipping 44 matching lines @@
   EXPECT_EQ(kAudioDecodeStats.calls_to_neteq, stats.decoding_calls_to_neteq);
   EXPECT_EQ(kAudioDecodeStats.decoded_normal, stats.decoding_normal);
   EXPECT_EQ(kAudioDecodeStats.decoded_plc, stats.decoding_plc);
   EXPECT_EQ(kAudioDecodeStats.decoded_cng, stats.decoding_cng);
   EXPECT_EQ(kAudioDecodeStats.decoded_plc_cng, stats.decoding_plc_cng);
   EXPECT_EQ(kCallStats.capture_start_ntp_time_ms_,
             stats.capture_start_ntp_time_ms);
 }
 }  // namespace test
 }  // namespace webrtc