Adding a new ChangeLogger class to handle UMA logging of bitrates

webrtc/modules/audio_coding/main/acm2/codec_manager.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_manager.h"
 
 #include "webrtc/base/checks.h"
 #include "webrtc/engine_configurations.h"
 #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.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"
 #include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {
 namespace acm2 {
 
 namespace {
 bool IsCodecRED(const CodecInst& codec) {
   return (STR_CASE_CMP(codec.plname, "RED") == 0);
 }
 
@@ skipping 120 matching lines @@
 }
 
 bool CodecSupported(const CodecInst& codec) {
   return IsOpus(codec) || IsPcmU(codec) || IsPcmA(codec) || IsPcm16B(codec) ||
          IsIlbc(codec) || IsG722(codec) || IsIsac(codec);
 }
 
 const CodecInst kEmptyCodecInst = {-1, "noCodecRegistered", 0, 0, 0, 0};
 }  // namespace
 
-CodecManager::CodecManager()
+CodecManager::CodecManager(DelayedLogger* bitrate_logger)
     : cng_nb_pltype_(255),
       cng_wb_pltype_(255),
       cng_swb_pltype_(255),
       cng_fb_pltype_(255),
       red_nb_pltype_(255),
       stereo_send_(false),
       dtx_enabled_(false),
       vad_mode_(VADNormal),
       send_codec_inst_(kEmptyCodecInst),
       red_enabled_(false),
-      codec_fec_enabled_(false) {
+      codec_fec_enabled_(false),
+      codec_owner_(bitrate_logger),
+      bitrate_logger_(bitrate_logger) {
   // Register the default payload type for RED and for CNG at sampling rates of
   // 8, 16, 32 and 48 kHz.
   for (int i = (ACMCodecDB::kNumCodecs - 1); i >= 0; i--) {
     if (IsCodecRED(i) && ACMCodecDB::database_[i].plfreq == 8000) {
       red_nb_pltype_ = static_cast<uint8_t>(ACMCodecDB::database_[i].pltype);
     } else if (IsCodecCN(i)) {
       if (ACMCodecDB::database_[i].plfreq == 8000) {
         cng_nb_pltype_ = static_cast<uint8_t>(ACMCodecDB::database_[i].pltype);
       } else if (ACMCodecDB::database_[i].plfreq == 16000) {
         cng_wb_pltype_ = static_cast<uint8_t>(ACMCodecDB::database_[i].pltype);
@@ skipping 127 matching lines @@
     DCHECK(codec_owner_.Encoder());
   }
   send_codec_inst_.plfreq = send_codec.plfreq;
   send_codec_inst_.pacsize = send_codec.pacsize;
   send_codec_inst_.channels = send_codec.channels;
   send_codec_inst_.pltype = send_codec.pltype;
 
   // Check if a change in Rate is required.
   if (send_codec.rate != send_codec_inst_.rate) {
     codec_owner_.SpeechEncoder()->SetTargetBitrate(send_codec.rate);
-    RTC_HISTOGRAM_COUNTS_100(
-        HISTOGRAM_NAME_AUDIO_TARGET_BITRATE_IN_KBPS,
-        codec_owner_.SpeechEncoder()->GetTargetBitrate() / 1000);
+    if (bitrate_logger_) {
+      bitrate_logger_->SetValue(
+          codec_owner_.SpeechEncoder()->GetTargetBitrate() / 1000);
+    }
     send_codec_inst_.rate = send_codec.rate;
   }
 
   codec_fec_enabled_ = codec_fec_enabled_ &&
                        codec_owner_.SpeechEncoder()->SetFec(codec_fec_enabled_);
 
   return 0;
 }
 
 void CodecManager::RegisterEncoder(
@@ skipping 140 matching lines @@
     case 48000:
       return -1;
     default:
       FATAL() << sample_rate_hz << " Hz is not supported";
       return -1;
   }
 }
 
 }  // namespace acm2
 }  // namespace webrtc