admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change place of UMA logging in AudioMixer.

Browse Source 
And fix typo in UMA metric.

We have this pattern in the FrameCombiner component of the AudioMixer:

  if (number_of_streams <= 1) {
    // Copy or fill with zeros.
    return;
  }
  // Mix and limit
  LogMixingStats(/* args */);

When there is only one remote stream, info about active streams and
sample rate is not logged. This CL moves the call to log stats before
the 'return'.

Bug: webrtc:8925
Change-Id: I7b54f61f628273631909dafbfafa21e155e18d4a
Reviewed-on: https://webrtc-review.googlesource.com/62860
Reviewed-by: Alessio Bazzica <alessiob@webrtc.org>
Commit-Queue: Alex Loiko <aleloi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22493}
This commit is contained in:
Alex Loiko 2018-03-19 14:32:05 +01:00 committed by Commit Bot
parent 537012405b
commit b9a02e523c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/audio_mixer/frame_combiner.cc
View File

@ -215,6 +215,9 @@ void FrameCombiner::Combine(const std::vector<AudioFrame*>& mix_list,
size_t number_of_streams,
AudioFrame* audio_frame_for_mixing) {
RTC_DCHECK(audio_frame_for_mixing);
LogMixingStats(mix_list, sample_rate, number_of_streams);
SetAudioFrameFields(mix_list, number_of_channels, sample_rate,
number_of_streams, audio_frame_for_mixing);
@ -255,8 +258,6 @@ void FrameCombiner::Combine(const std::vector<AudioFrame*>& mix_list,
}
InterleaveToAudioFrame(mixing_buffer_view, audio_frame_for_mixing);
LogMixingStats(mix_list, sample_rate, number_of_streams);
}
void FrameCombiner::LogMixingStats(const std::vector<AudioFrame*>& mix_list,

2
modules/audio_processing/agc2/interpolated_gain_curve.cc
View File

@ -21,7 +21,7 @@ namespace {
void LogRegionStats(const InterpolatedGainCurve::Stats& stats) {
using Region = InterpolatedGainCurve::GainCurveRegion;
std::string histogram_name = "WebRTC.Audio.AGC2.FixedDigitalGainCurveRegion.";
std::string histogram_name = "WebRTC.Audio.Agc2.FixedDigitalGainCurveRegion.";
if (stats.region == Region::kIdentity) {
histogram_name += "Identity";
} else if (stats.region == Region::kKnee) {