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

Let NetEq stats getter provide time for each stats query.

Browse Source 
Bug: webrtc:9147
Change-Id: Idb3677bfa41bac7c050361b2ade220a84bb399be
Reviewed-on: https://webrtc-review.googlesource.com/70401
Commit-Queue: Minyue Li <minyue@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22978}
This commit is contained in:
Minyue Li
2018-04-23 09:40:56 +02:00
committed by Commit Bot
parent d78f70514f
commit e999b3fdf7
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/audio_coding/neteq/tools/neteq_stats_getter.cc
View File

@ -52,7 +52,7 @@ void NetEqStatsGetter::AfterGetAudio(int64_t time_now_ms,
stats_query_interval_ms_) { stats_query_interval_ms_) {
NetEqNetworkStatistics stats; NetEqNetworkStatistics stats;
RTC_CHECK_EQ(neteq->NetworkStatistics(&stats), 0); RTC_CHECK_EQ(neteq->NetworkStatistics(&stats), 0);
stats_.push_back(stats); stats_.push_back(std::make_pair(time_now_ms, stats));
last_stats_query_time_ms_ = time_now_ms; last_stats_query_time_ms_ = time_now_ms;
} }
const auto lifetime_stat = neteq->GetLifetimeStatistics(); const auto lifetime_stat = neteq->GetLifetimeStatistics();
@ -88,18 +88,19 @@ void NetEqStatsGetter::AfterGetAudio(int64_t time_now_ms,
} }
double NetEqStatsGetter::AverageSpeechExpandRate() const { double NetEqStatsGetter::AverageSpeechExpandRate() const {
double sum_speech_expand = double sum_speech_expand = std::accumulate(
std::accumulate(stats_.begin(), stats_.end(), double{0.0}, stats_.begin(), stats_.end(), double{0.0},
[](double a, NetEqNetworkStatistics b) { [](double a, std::pair<int64_t, NetEqNetworkStatistics> b) {
return a + static_cast<double>(b.speech_expand_rate); return a + static_cast<double>(b.second.speech_expand_rate);
}); });
return sum_speech_expand / 16384.0 / stats_.size(); return sum_speech_expand / 16384.0 / stats_.size();
} }
NetEqStatsGetter::Stats NetEqStatsGetter::AverageStats() const { NetEqStatsGetter::Stats NetEqStatsGetter::AverageStats() const {
Stats sum_stats = std::accumulate( Stats sum_stats = std::accumulate(
stats_.begin(), stats_.end(), Stats(), stats_.begin(), stats_.end(), Stats(),
[](Stats a, NetEqNetworkStatistics b) { [](Stats a, std::pair<int64_t, NetEqNetworkStatistics> bb) {
const auto& b = bb.second;
a.current_buffer_size_ms += b.current_buffer_size_ms; a.current_buffer_size_ms += b.current_buffer_size_ms;
a.preferred_buffer_size_ms += b.preferred_buffer_size_ms; a.preferred_buffer_size_ms += b.preferred_buffer_size_ms;
a.jitter_peaks_found += b.jitter_peaks_found; a.jitter_peaks_found += b.jitter_peaks_found;

8
modules/audio_coding/neteq/tools/neteq_stats_getter.h
View File

@ -56,8 +56,6 @@ class NetEqStatsGetter : public NetEqGetAudioCallback {
// valid value. // valid value.
explicit NetEqStatsGetter(std::unique_ptr<NetEqDelayAnalyzer> delay_analyzer); explicit NetEqStatsGetter(std::unique_ptr<NetEqDelayAnalyzer> delay_analyzer);
int64_t stats_query_interval_ms() const { return stats_query_interval_ms_; }
void set_stats_query_interval_ms(int64_t stats_query_interval_ms) { void set_stats_query_interval_ms(int64_t stats_query_interval_ms) {
stats_query_interval_ms_ = stats_query_interval_ms; stats_query_interval_ms_ = stats_query_interval_ms;
} }
@ -81,13 +79,17 @@ class NetEqStatsGetter : public NetEqGetAudioCallback {
return concealment_events_; return concealment_events_;
} }
const std::vector<std::pair<int64_t, NetEqNetworkStatistics>>& stats() const {
return stats_;
}
Stats AverageStats() const; Stats AverageStats() const;
private: private:
std::unique_ptr<NetEqDelayAnalyzer> delay_analyzer_; std::unique_ptr<NetEqDelayAnalyzer> delay_analyzer_;
int64_t stats_query_interval_ms_ = 1000; int64_t stats_query_interval_ms_ = 1000;
int64_t last_stats_query_time_ms_ = 0; int64_t last_stats_query_time_ms_ = 0;
std::vector<NetEqNetworkStatistics> stats_; std::vector<std::pair<int64_t, NetEqNetworkStatistics>> stats_;
size_t current_concealment_event_ = 1; size_t current_concealment_event_ = 1;
uint64_t voice_concealed_samples_until_last_event_ = 0; uint64_t voice_concealed_samples_until_last_event_ = 0;
std::vector<ConcealmentEvent> concealment_events_; std::vector<ConcealmentEvent> concealment_events_;