Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Unified Diff: webrtc/modules/remote_bitrate_estimator/test/estimators/abs_send_time.cc

Issue 2431093003: Fix BWE simulations so that it uses the delay based BWE. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/remote_bitrate_estimator/test/estimators/abs_send_time.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/abs_send_time.cc
similarity index 83%
copy from webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
copy to webrtc/modules/remote_bitrate_estimator/test/estimators/abs_send_time.cc
index 0b9312890fdc2e821c0f9760fe6620613b714172..6eff561a1e93e758aba5ddcaf2aa14181c23b3d7 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/abs_send_time.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h"
+#include "webrtc/modules/remote_bitrate_estimator/test/estimators/abs_send_time.h"
#include <algorithm>
@@ -22,7 +22,9 @@ namespace bwe {
const int kFeedbackIntervalMs = 50;
-FullBweSender::FullBweSender(int kbps, BitrateObserver* observer, Clock* clock)
+AbsSendTimeBweSender::AbsSendTimeBweSender(int kbps,
+ BitrateObserver* observer,
+ Clock* clock)
: bitrate_controller_(
BitrateController::CreateBitrateController(clock,
observer,
@@ -42,14 +44,13 @@ FullBweSender::FullBweSender(int kbps, BitrateObserver* observer, Clock* clock)
rbe_->SetMinBitrate(1000 * kMinBitrateKbps);
}
-FullBweSender::~FullBweSender() {
-}
+AbsSendTimeBweSender::~AbsSendTimeBweSender() {}
-int FullBweSender::GetFeedbackIntervalMs() const {
+int AbsSendTimeBweSender::GetFeedbackIntervalMs() const {
return kFeedbackIntervalMs;
}
-void FullBweSender::GiveFeedback(const FeedbackPacket& feedback) {
+void AbsSendTimeBweSender::GiveFeedback(const FeedbackPacket& feedback) {
const SendSideBweFeedback& fb =
static_cast<const SendSideBweFeedback&>(feedback);
if (fb.packet_feedback_vector().empty())
@@ -99,7 +100,7 @@ void FullBweSender::GiveFeedback(const FeedbackPacket& feedback) {
}
}
-void FullBweSender::OnPacketsSent(const Packets& packets) {
+void AbsSendTimeBweSender::OnPacketsSent(const Packets& packets) {
for (Packet* packet : packets) {
if (packet->GetPacketType() == Packet::kMedia) {
MediaPacket* media_packet = static_cast<MediaPacket*>(packet);
@@ -114,29 +115,28 @@ void FullBweSender::OnPacketsSent(const Packets& packets) {
}
}
-void FullBweSender::OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs,
- uint32_t bitrate) {
+void AbsSendTimeBweSender::OnReceiveBitrateChanged(
+ const std::vector<uint32_t>& ssrcs,
+ uint32_t bitrate) {
feedback_observer_->OnReceivedEstimatedBitrate(bitrate);
}
-int64_t FullBweSender::TimeUntilNextProcess() {
+int64_t AbsSendTimeBweSender::TimeUntilNextProcess() {
return bitrate_controller_->TimeUntilNextProcess();
}
-void FullBweSender::Process() {
+void AbsSendTimeBweSender::Process() {
rbe_->Process();
bitrate_controller_->Process();
}
-SendSideBweReceiver::SendSideBweReceiver(int flow_id)
- : BweReceiver(flow_id), last_feedback_ms_(0) {
-}
+AbsSendTimeBweReceiver::AbsSendTimeBweReceiver(int flow_id)
+ : BweReceiver(flow_id), last_feedback_ms_(0) {}
-SendSideBweReceiver::~SendSideBweReceiver() {
-}
+AbsSendTimeBweReceiver::~AbsSendTimeBweReceiver() {}
-void SendSideBweReceiver::ReceivePacket(int64_t arrival_time_ms,
- const MediaPacket& media_packet) {
+void AbsSendTimeBweReceiver::ReceivePacket(int64_t arrival_time_ms,
+ const MediaPacket& media_packet) {
packet_feedback_vector_.push_back(PacketInfo(
-1, arrival_time_ms, media_packet.sender_timestamp_ms(),
media_packet.header().sequenceNumber, media_packet.payload_size(), true));
@@ -145,7 +145,7 @@ void SendSideBweReceiver::ReceivePacket(int64_t arrival_time_ms,
BweReceiver::ReceivePacket(arrival_time_ms, media_packet);
}
-FeedbackPacket* SendSideBweReceiver::GetFeedback(int64_t now_ms) {
+FeedbackPacket* AbsSendTimeBweReceiver::GetFeedback(int64_t now_ms) {
if (now_ms - last_feedback_ms_ < kFeedbackIntervalMs)
return NULL;
last_feedback_ms_ = now_ms;

Powered by Google App Engine
This is Rietveld 408576698