Index: webrtc/modules/remote_bitrate_estimator/inter_arrival.cc |
diff --git a/webrtc/modules/remote_bitrate_estimator/inter_arrival.cc b/webrtc/modules/remote_bitrate_estimator/inter_arrival.cc |
index 3dee305bad109170c11650b81afd2bb7368581bb..75615eeb0de9bf939aaf13d0022b38ee0e417af7 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/inter_arrival.cc |
+++ b/webrtc/modules/remote_bitrate_estimator/inter_arrival.cc |
@@ -31,13 +31,10 @@ InterArrival::InterArrival(uint32_t timestamp_group_length_ticks, |
bool InterArrival::ComputeDeltas(uint32_t timestamp, |
int64_t arrival_time_ms, |
- size_t packet_size, |
uint32_t* timestamp_delta, |
- int64_t* arrival_time_delta_ms, |
- int* packet_size_delta) { |
+ int64_t* arrival_time_delta_ms) { |
assert(timestamp_delta != NULL); |
assert(arrival_time_delta_ms != NULL); |
- assert(packet_size_delta != NULL); |
bool calculated_deltas = false; |
if (current_timestamp_group_.IsFirstPacket()) { |
// We don't have enough data to update the filter, so we store it until we |
@@ -62,22 +59,17 @@ bool InterArrival::ComputeDeltas(uint32_t timestamp, |
return false; |
} |
assert(*arrival_time_delta_ms >= 0); |
- *packet_size_delta = static_cast<int>(current_timestamp_group_.size) - |
- static_cast<int>(prev_timestamp_group_.size); |
calculated_deltas = true; |
} |
prev_timestamp_group_ = current_timestamp_group_; |
// The new timestamp is now the current frame. |
current_timestamp_group_.first_timestamp = timestamp; |
current_timestamp_group_.timestamp = timestamp; |
- current_timestamp_group_.size = 0; |
} |
else { |
current_timestamp_group_.timestamp = LatestTimestamp( |
current_timestamp_group_.timestamp, timestamp); |
} |
- // Accumulate the frame size. |
- current_timestamp_group_.size += packet_size; |
current_timestamp_group_.complete_time_ms = arrival_time_ms; |
terelius
2015/10/12 12:04:40
= max(complete_time_ms, arrival_time_ms); maybe?
stefan-webrtc
2015/11/24 16:08:03
Done.
|
return calculated_deltas; |