zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement new stats interface on NetEq to monitor the operations and internal state.

Browse Source 
Currently we use the NetworkStatistics to monitor these metrics, but because these get reset on every call, this makes it impossible to use them for other purposes.

Bug: webrtc:9667
Change-Id: If648085f04d2d58aae263cff5b9491bcad373a96
Reviewed-on: https://webrtc-review.googlesource.com/99740
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Commit-Queue: Ivo Creusen <ivoc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24727}
This commit is contained in:
Ivo Creusen
2018-09-13 14:39:55 +02:00
committed by Commit Bot
parent 9c38c47630
commit d1c2f78bfe
7 changed files with 70 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
modules/audio_coding/neteq/tools/neteq_test.cc
View File

@ -153,25 +153,35 @@ NetEqTest::SimulationStepResult NetEqTest::RunToNextGetAudio() {
input_->AdvanceOutputEvent();
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;
int scaling_factor = std::max(1 << 14, network_stats.accelerate_rate +
network_stats.expand_rate +
network_stats.preemptive_rate);
// TODO(ivoc): Improve the accuracy of these numbers by adding a new API
// to NetEq.
result.action_times_ms[Action::kAccelerate] =
(10 * network_stats.accelerate_rate) / scaling_factor;
result.action_times_ms[Action::kExpand] =
(10 * network_stats.expand_rate) / scaling_factor;
result.action_times_ms[Action::kPreemptiveExpand] =
(10 * network_stats.preemptive_rate) / scaling_factor;
result.action_times_ms[Action::kNormal] =
10 - result.action_times_ms[Action::kAccelerate] -
result.action_times_ms[Action::kExpand] -
result.action_times_ms[Action::kPreemptiveExpand];
const auto operations_state = neteq_->GetOperationsAndState();
current_state_.current_delay_ms = operations_state.current_buffer_size_ms;
// TODO(ivoc): Add more accurate reporting by tracking the origin of
// samples in the sync buffer.
result.action_times_ms[Action::kExpand] = 0;
result.action_times_ms[Action::kAccelerate] = 0;
result.action_times_ms[Action::kPreemptiveExpand] = 0;
result.action_times_ms[Action::kNormal] = 0;
if (out_frame.speech_type_ == AudioFrame::SpeechType::kPLC ||
out_frame.speech_type_ == AudioFrame::SpeechType::kPLCCNG) {
// Consider the whole frame to be the result of expansion.
result.action_times_ms[Action::kExpand] = 10;
} else if (operations_state.accelerate_samples -
prev_ops_state_.accelerate_samples >
0) {
// Consider the whole frame to be the result of acceleration.
result.action_times_ms[Action::kAccelerate] = 10;
} else if (operations_state.preemptive_samples -
prev_ops_state_.preemptive_samples >
0) {
// Consider the whole frame to be the result of preemptive expansion.
result.action_times_ms[Action::kPreemptiveExpand] = 10;
} else {
// Consider the whole frame to be the result of normal playout.
result.action_times_ms[Action::kNormal] = 10;
}
result.is_simulation_finished = input_->ended();
prev_ops_state_ = operations_state;
return result;
}
}