Adding a new ChangeLogger class to handle UMA logging of bitrates

webrtc/modules/audio_coding/main/acm2/codec_owner.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/audio_coding/main/acm2/codec_owner.h"
 
 #include "webrtc/base/checks.h"
 #include "webrtc/engine_configurations.h"
 #include "webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h"
 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h"
 #include "webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h"
 #include "webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h"
 #include "webrtc/modules/audio_coding/codecs/isac/fix/interface/audio_encoder_isacfix.h"
 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_encoder_isac.h"
 #include "webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h"
 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b.h"
 #include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h"
-#include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h"
-#include "webrtc/system_wrappers/interface/metrics.h"
+#include "webrtc/modules/audio_coding/main/acm2/delayed_logger.h"
 
 namespace webrtc {
 namespace acm2 {
 
 namespace {
 bool IsIsac(const CodecInst& codec) {
   return
 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
       !STR_CASE_CMP(codec.plname, "isac") ||
 #endif
@@ skipping 34 matching lines @@
 
 bool IsG722(const CodecInst& codec) {
   return
 #ifdef WEBRTC_CODEC_G722
       !STR_CASE_CMP(codec.plname, "g722") ||
 #endif
       false;
 }
 }  // namespace
 
-CodecOwner::CodecOwner()
-    : isac_is_encoder_(false), external_speech_encoder_(nullptr) {
+CodecOwner::CodecOwner(DelayedLogger* bitrate_logger)
+    : isac_is_encoder_(false),
+      external_speech_encoder_(nullptr),
+      bitrate_logger_(bitrate_logger) {
 }
 
 CodecOwner::~CodecOwner() = default;
 
 namespace {
 AudioEncoderDecoderMutableIsac* CreateIsacCodec(const CodecInst& speech_inst) {
 #if defined(WEBRTC_CODEC_ISACFX)
   return new AudioEncoderDecoderMutableIsacFix(speech_inst);
 #elif defined(WEBRTC_CODEC_ISAC)
   return new AudioEncoderDecoderMutableIsacFloat(speech_inst);
@@ skipping 83 matching lines @@
 }  // namespace
 
 void CodecOwner::SetEncoders(const CodecInst& speech_inst,
                              int cng_payload_type,
                              ACMVADMode vad_mode,
                              int red_payload_type) {
   CreateSpeechEncoder(speech_inst, &speech_encoder_, &isac_codec_,
                       &isac_is_encoder_);
   external_speech_encoder_ = nullptr;
   ChangeCngAndRed(cng_payload_type, vad_mode, red_payload_type);
-  RTC_HISTOGRAM_COUNTS_100(HISTOGRAM_NAME_AUDIO_TARGET_BITRATE_IN_KBPS,
-                           SpeechEncoder()->GetTargetBitrate() / 1000);
+  if (bitrate_logger_) {
+    bitrate_logger_->SetValue(SpeechEncoder()->GetTargetBitrate() / 1000);
+  }
 }
 
 void CodecOwner::SetEncoders(AudioEncoderMutable* external_speech_encoder,
                              int cng_payload_type,
                              ACMVADMode vad_mode,
                              int red_payload_type) {
   external_speech_encoder_ = external_speech_encoder;
   speech_encoder_.reset();
   isac_is_encoder_ = false;
   ChangeCngAndRed(cng_payload_type, vad_mode, red_payload_type);
-  RTC_HISTOGRAM_COUNTS_100(HISTOGRAM_NAME_AUDIO_TARGET_BITRATE_IN_KBPS,
-                           SpeechEncoder()->GetTargetBitrate() / 1000);
+  if (bitrate_logger_) {
+    bitrate_logger_->SetValue(SpeechEncoder()->GetTargetBitrate() / 1000);
+  }
 }
 
 void CodecOwner::ChangeCngAndRed(int cng_payload_type,
                                  ACMVADMode vad_mode,
                                  int red_payload_type) {
   AudioEncoderMutable* speech_encoder = SpeechEncoder();
   if (cng_payload_type != -1 || red_payload_type != -1) {
     // The RED and CNG encoders need to be in sync with the speech encoder, so
     // reset the latter to ensure its buffer is empty.
     speech_encoder->Reset();
@@ skipping 46 matching lines @@
   DCHECK_LE(num_true, 1);
   if (external_speech_encoder_)
     return external_speech_encoder_;
   if (speech_encoder_)
     return speech_encoder_.get();
   return isac_is_encoder_ ? isac_codec_.get() : nullptr;
 }
 
 }  // namespace acm2
 }  // namespace webrtc