From 9be774550930c5ad6a49130b02599c503ac80ec8 Mon Sep 17 00:00:00 2001 From: Henrik Lundin Date: Mon, 10 Sep 2018 12:53:27 +0200 Subject: [PATCH] NetEq tools: Fixing an issue with measuring the simulation time The NetEqTest class was recently refactored. In the process, the functionality for measuring the simulation time suffered a bug. This CL fixes it. Bug: webrtc:9667 Change-Id: I139e697ede21584ef77ae23cfa8e77f6dac65b51 Reviewed-on: https://webrtc-review.googlesource.com/98982 Commit-Queue: Henrik Lundin Reviewed-by: Ivo Creusen Cr-Commit-Position: refs/heads/master@{#24658} --- modules/audio_coding/neteq/tools/neteq_test.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/audio_coding/neteq/tools/neteq_test.cc b/modules/audio_coding/neteq/tools/neteq_test.cc index 08e17dc023..ff6004847c 100644 --- a/modules/audio_coding/neteq/tools/neteq_test.cc +++ b/modules/audio_coding/neteq/tools/neteq_test.cc @@ -144,7 +144,8 @@ NetEqTest::SimulationStepResult NetEqTest::RunToNextGetAudio() { } input_->AdvanceOutputEvent(); - result.simulation_step_ms = time_now_ms - start_time_ms; + result.simulation_step_ms = + input_->NextEventTime().value_or(time_now_ms) - start_time_ms; const auto network_stats = SimulationStats(); current_state_.current_delay_ms = network_stats.current_buffer_size_ms; current_state_.packet_loss_occurred = network_stats.packet_loss_rate > 0; @@ -167,7 +168,8 @@ NetEqTest::SimulationStepResult NetEqTest::RunToNextGetAudio() { return result; } } - result.simulation_step_ms = time_now_ms - start_time_ms; + result.simulation_step_ms = + input_->NextEventTime().value_or(time_now_ms) - start_time_ms; result.is_simulation_finished = true; return result; }