mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-19 08:37:54 +01:00
87f3a14fdb
This reverts commit 8c319e951a.
Reason for revert: Increase in dropped frames and decreased send bandwidth in perf tests.
Original change's description:
> Now calculates RTT in SendSideCongestionController.
>
> Moved calculation of round trip time from transport feedback adapter to send side congestion
> controller. This reduces the role of the transport specific transport feedback adapter and
> gives more power to the congestion controller to decide how the feedback rtt should be
> calculated and used.
>
> Bug: webrtc:8415
> Change-Id: I7878d9fb32c3f4ed11993a6f39e6d9c69fab190a
> Reviewed-on: https://webrtc-review.googlesource.com/27980
> Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#20973}
TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org
Change-Id: I993d00de7171a163a41b486d68b9255fd5c0f5da
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:8415
Reviewed-on: https://webrtc-review.googlesource.com/28300
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20984}
82 lines
2.9 KiB
C++
82 lines
2.9 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
|
|
#define MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
|
|
|
|
#include <deque>
|
|
#include <vector>
|
|
|
|
#include "modules/remote_bitrate_estimator/include/send_time_history.h"
|
|
#include "rtc_base/criticalsection.h"
|
|
#include "rtc_base/thread_annotations.h"
|
|
#include "rtc_base/thread_checker.h"
|
|
#include "system_wrappers/include/clock.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class PacketFeedbackObserver;
|
|
|
|
namespace rtcp {
|
|
class TransportFeedback;
|
|
} // namespace rtcp
|
|
|
|
class TransportFeedbackAdapter {
|
|
public:
|
|
explicit TransportFeedbackAdapter(const Clock* clock);
|
|
virtual ~TransportFeedbackAdapter();
|
|
|
|
void RegisterPacketFeedbackObserver(PacketFeedbackObserver* observer);
|
|
void DeRegisterPacketFeedbackObserver(PacketFeedbackObserver* observer);
|
|
|
|
void AddPacket(uint32_t ssrc,
|
|
uint16_t sequence_number,
|
|
size_t length,
|
|
const PacedPacketInfo& pacing_info);
|
|
void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms);
|
|
|
|
// TODO(holmer): This method should return DelayBasedBwe::Result so that we
|
|
// can get rid of the dependency on BitrateController. Requires changes
|
|
// to the CongestionController interface.
|
|
void OnTransportFeedback(const rtcp::TransportFeedback& feedback);
|
|
std::vector<PacketFeedback> GetTransportFeedbackVector() const;
|
|
rtc::Optional<int64_t> GetMinFeedbackLoopRtt() const;
|
|
|
|
void SetTransportOverhead(int transport_overhead_bytes_per_packet);
|
|
|
|
void SetNetworkIds(uint16_t local_id, uint16_t remote_id);
|
|
|
|
size_t GetOutstandingBytes() const;
|
|
|
|
private:
|
|
std::vector<PacketFeedback> GetPacketFeedbackVector(
|
|
const rtcp::TransportFeedback& feedback);
|
|
|
|
const bool send_side_bwe_with_overhead_;
|
|
rtc::CriticalSection lock_;
|
|
int transport_overhead_bytes_per_packet_ RTC_GUARDED_BY(&lock_);
|
|
SendTimeHistory send_time_history_ RTC_GUARDED_BY(&lock_);
|
|
const Clock* const clock_;
|
|
int64_t current_offset_ms_;
|
|
int64_t last_timestamp_us_;
|
|
std::vector<PacketFeedback> last_packet_feedback_vector_;
|
|
uint16_t local_net_id_ RTC_GUARDED_BY(&lock_);
|
|
uint16_t remote_net_id_ RTC_GUARDED_BY(&lock_);
|
|
std::deque<int64_t> feedback_rtts_ RTC_GUARDED_BY(&lock_);
|
|
rtc::Optional<int64_t> min_feedback_rtt_ RTC_GUARDED_BY(&lock_);
|
|
|
|
rtc::CriticalSection observers_lock_;
|
|
std::vector<PacketFeedbackObserver*> observers_
|
|
RTC_GUARDED_BY(&observers_lock_);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
|