Revert of Always call RemoteBitrateEstimator::IncomingPacket from Call.

webrtc/audio/audio_receive_stream.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 312 matching lines @@
                                     const PacketTime& packet_time) {
   // TODO(solenberg): Tests call this function on a network thread, libjingle
   // calls on the worker thread. We should move towards always using a network
   // thread. Then this check can be enabled.
   // RTC_DCHECK(!thread_checker_.CalledOnValidThread());
   RTPHeader header;
   if (!rtp_header_parser_->Parse(packet, length, &header)) {
     return false;
   }
 
+  // Only forward if the parsed header has one of the headers necessary for
+  // bandwidth estimation. RTP timestamps has different rates for audio and
+  // video and shouldn't be mixed.
+  if (config_.rtp.transport_cc &&
+      header.extension.hasTransportSequenceNumber) {
+    int64_t arrival_time_ms = rtc::TimeMillis();
+    if (packet_time.timestamp >= 0)
+      arrival_time_ms = (packet_time.timestamp + 500) / 1000;
+    size_t payload_size = length - header.headerLength;
+    remote_bitrate_estimator_->IncomingPacket(arrival_time_ms, payload_size,
+                                              header);
+  }
+
   return channel_proxy_->ReceivedRTPPacket(packet, length, packet_time);
 }
 
 const webrtc::AudioReceiveStream::Config& AudioReceiveStream::config() const {
   RTC_DCHECK_RUN_ON(&worker_thread_checker_);
   return config_;
 }
 
 VoiceEngine* AudioReceiveStream::voice_engine() const {
   auto* voice_engine = audio_state()->voice_engine();
@@ skipping 10 matching lines @@
 int AudioReceiveStream::SetVoiceEnginePlayout(bool playout) {
   ScopedVoEInterface<VoEBase> base(voice_engine());
   if (playout) {
     return base->StartPlayout(config_.voe_channel_id);
   } else {
     return base->StopPlayout(config_.voe_channel_id);
   }
 }
 }  // namespace internal
 }  // namespace webrtc