Fix build errors in r9022 / 09bdc1e5f5a9.
Implicit casts detected by Win64 Release. TBR=pbos@webrtc.org BUG=4548 Review URL: https://webrtc-codereview.appspot.com/44239004 Cr-Commit-Position: refs/heads/master@{#9023}
This commit is contained in:
parent
09bdc1e5f5
commit
d4e80146e3
@ -285,7 +285,8 @@ void RateCounterFilter::Plot(int64_t timestamp_ms) {
|
||||
void RateCounterFilter::RunFor(int64_t /*time_ms*/, Packets* in_out) {
|
||||
assert(in_out);
|
||||
for (const Packet* packet : *in_out) {
|
||||
rate_counter_->UpdateRates(packet->send_time_us(), packet->payload_size());
|
||||
rate_counter_->UpdateRates(packet->send_time_us(),
|
||||
static_cast<int>(packet->payload_size()));
|
||||
}
|
||||
packets_per_second_stats_.Push(rate_counter_->packets_per_second());
|
||||
kbps_stats_.Push(rate_counter_->bits_per_second() / 1000.0);
|
||||
|
@ -59,7 +59,8 @@ void FullBweSender::GiveFeedback(const FeedbackPacket& feedback) {
|
||||
// Assuming no reordering for now.
|
||||
if (expected_packets <= 0)
|
||||
return;
|
||||
int lost_packets = expected_packets - fb.packet_feedback_vector().size();
|
||||
int lost_packets =
|
||||
expected_packets - static_cast<int>(fb.packet_feedback_vector().size());
|
||||
report_block_.fractionLost = (lost_packets << 8) / expected_packets;
|
||||
report_block_.cumulativeLost += lost_packets;
|
||||
ReportBlockList report_blocks;
|
||||
|
@ -285,7 +285,7 @@ void TcpSender::SendPackets(Packets* in_out) {
|
||||
int packets_to_send = std::max(cwnd - in_flight_, 0);
|
||||
if (packets_to_send > 0) {
|
||||
Packets generated = GeneratePackets(packets_to_send);
|
||||
in_flight_ += generated.size();
|
||||
in_flight_ += static_cast<int>(generated.size());
|
||||
in_out->merge(generated, DereferencingComparator<Packet>);
|
||||
}
|
||||
}
|
||||
@ -295,7 +295,7 @@ void TcpSender::UpdateCongestionControl(const FeedbackPacket* fb) {
|
||||
DCHECK(!tcp_fb->acked_packets().empty());
|
||||
ack_received_ = true;
|
||||
|
||||
in_flight_ -= tcp_fb->acked_packets().size();
|
||||
in_flight_ -= static_cast<int>(tcp_fb->acked_packets().size());
|
||||
DCHECK_GE(in_flight_, 0);
|
||||
|
||||
if (LossEvent(tcp_fb->acked_packets())) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user