summaryrefslogtreecommitdiff
path: root/chromium/media/base/audio_renderer_mixer.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/base/audio_renderer_mixer.cc')
-rw-r--r--chromium/media/base/audio_renderer_mixer.cc42
1 files changed, 2 insertions, 40 deletions
diff --git a/chromium/media/base/audio_renderer_mixer.cc b/chromium/media/base/audio_renderer_mixer.cc
index d3c1bd8c7db..d7109300027 100644
--- a/chromium/media/base/audio_renderer_mixer.cc
+++ b/chromium/media/base/audio_renderer_mixer.cc
@@ -24,49 +24,15 @@ namespace media {
enum { kPauseDelaySeconds = 10 };
-// Tracks the maximum value of a counter and logs it into a UMA histogram upon
-// each increase of the maximum. NOT thread-safe, make sure it is used under
-// lock.
-class AudioRendererMixer::UMAMaxValueTracker {
- public:
- UMAMaxValueTracker(UmaLogCallback log_callback)
- : log_callback_(std::move(log_callback)), count_(0), max_count_(0) {}
-
- ~UMAMaxValueTracker() = default;
-
- // Increments the counter, updates the maximum.
- void Increment() {
- ++count_;
- if (max_count_ < count_) {
- max_count_ = count_;
- log_callback_.Run(max_count_);
- }
- }
-
- // Decrements the counter.
- void Decrement() {
- DCHECK_GE(count_, 0);
- --count_;
- }
-
- private:
- const UmaLogCallback log_callback_;
- int count_;
- int max_count_;
- DISALLOW_COPY_AND_ASSIGN(UMAMaxValueTracker);
-};
-
AudioRendererMixer::AudioRendererMixer(const AudioParameters& output_params,
- scoped_refptr<AudioRendererSink> sink,
- UmaLogCallback log_callback)
+ scoped_refptr<AudioRendererSink> sink)
: output_params_(output_params),
audio_sink_(std::move(sink)),
master_converter_(output_params, output_params, true),
pause_delay_(base::TimeDelta::FromSeconds(kPauseDelaySeconds)),
last_play_time_(base::TimeTicks::Now()),
// Initialize |playing_| to true since Start() results in an auto-play.
- playing_(true),
- input_count_tracker_(new UMAMaxValueTracker(std::move(log_callback))) {
+ playing_(true) {
DCHECK(audio_sink_);
// If enabled we will disable the real audio output stream for muted/silent
@@ -126,8 +92,6 @@ void AudioRendererMixer::AddMixerInput(const AudioParameters& input_params,
}
converter->second->AddInput(input);
}
-
- input_count_tracker_->Increment();
}
void AudioRendererMixer::RemoveMixerInput(
@@ -148,8 +112,6 @@ void AudioRendererMixer::RemoveMixerInput(
converters_.erase(converter);
}
}
-
- input_count_tracker_->Decrement();
}
void AudioRendererMixer::AddErrorCallback(AudioRendererMixerInput* input) {