generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build errors in r9022 / 09bdc1e5f5a9.

Browse Source 
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:
Stefan Holmer 2015-04-16 20:35:42 +02:00
parent 09bdc1e5f5
commit d4e80146e3
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
View File

@ -285,7 +285,8 @@ void RateCounterFilter::Plot(int64_t timestamp_ms) {
void RateCounterFilter::RunFor(int64_t /*time_ms*/, Packets* in_out) { void RateCounterFilter::RunFor(int64_t /*time_ms*/, Packets* in_out) {
assert(in_out); assert(in_out);
for (const Packet* packet : *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()); packets_per_second_stats_.Push(rate_counter_->packets_per_second());
kbps_stats_.Push(rate_counter_->bits_per_second() / 1000.0); kbps_stats_.Push(rate_counter_->bits_per_second() / 1000.0);

3
webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
View File

@ -59,7 +59,8 @@ void FullBweSender::GiveFeedback(const FeedbackPacket& feedback) {
// Assuming no reordering for now. // Assuming no reordering for now.
if (expected_packets <= 0) if (expected_packets <= 0)
return; 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_.fractionLost = (lost_packets << 8) / expected_packets;
report_block_.cumulativeLost += lost_packets; report_block_.cumulativeLost += lost_packets;
ReportBlockList report_blocks; ReportBlockList report_blocks;

4
webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc
View File

@ -285,7 +285,7 @@ void TcpSender::SendPackets(Packets* in_out) {
int packets_to_send = std::max(cwnd - in_flight_, 0); int packets_to_send = std::max(cwnd - in_flight_, 0);
if (packets_to_send > 0) { if (packets_to_send > 0) {
Packets generated = GeneratePackets(packets_to_send); Packets generated = GeneratePackets(packets_to_send);
in_flight_ += generated.size(); in_flight_ += static_cast<int>(generated.size());
in_out->merge(generated, DereferencingComparator<Packet>); in_out->merge(generated, DereferencingComparator<Packet>);
} }
} }
@ -295,7 +295,7 @@ void TcpSender::UpdateCongestionControl(const FeedbackPacket* fb) {
DCHECK(!tcp_fb->acked_packets().empty()); DCHECK(!tcp_fb->acked_packets().empty());
ack_received_ = true; 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); DCHECK_GE(in_flight_, 0);
if (LossEvent(tcp_fb->acked_packets())) { if (LossEvent(tcp_fb->acked_packets())) {