57daeb7ac7
This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. Original change's description: > Moved congestion controller to task queue. > > The goal of this work is to make it easier to experiment with the > bandwidth estimation implementation. For this reason network control > functionality is moved from SendSideCongestionController(SSCC), > PacedSender and BitrateController to the newly created > GoogCcNetworkController which implements the newly created > NetworkControllerInterface. This allows the implementation to be > replaced at runtime in the future. > > This is the first part of a split of a larger CL, see: > https://webrtc-review.googlesource.com/c/src/+/39788/8 > For further explanations. > > Bug: webrtc:8415 > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > Reviewed-on: https://webrtc-review.googlesource.com/43840 > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > Reviewed-by: Björn Terelius <terelius@webrtc.org> > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#21868} Bug: webrtc:8415 Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da Reviewed-on: https://webrtc-review.googlesource.com/48000 Reviewed-by: Stefan Holmer <stefan@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21899}
79 lines
2.6 KiB
C++
79 lines
2.6 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/congestion_controller/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<PacketFeedback> GetPacket(uint16_t sequence_number) 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);
|
|
|
|
rtc::CriticalSection 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_);
|
|
|
|
rtc::CriticalSection observers_lock_;
|
|
std::vector<PacketFeedbackObserver*> observers_
|
|
RTC_GUARDED_BY(&observers_lock_);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
|