Report AudioParameters::Format in media-internals. Fix effects.

content/browser/media/media_internals.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/media_internals.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 24 matching lines @@
   if (effects == media::AudioParameters::NO_EFFECTS)
     return "NO_EFFECTS";
 
   struct {
     int flag;
     const char* name;
   } flags[] = {
     { media::AudioParameters::ECHO_CANCELLER, "ECHO_CANCELLER" },
     { media::AudioParameters::DUCKING, "DUCKING" },
     { media::AudioParameters::KEYBOARD_MIC, "KEYBOARD_MIC" },
+    { media::AudioParameters::HOTWORD, "HOTWORD" },
   };
 
   std::string ret;
   for (size_t i = 0; i < arraysize(flags); ++i) {
     if (effects & flags[i].flag) {
       if (!ret.empty())
         ret += " | ";
       ret += flags[i].name;
       effects &= ~flags[i].flag;
     }
   }
 
   if (effects) {
     if (!ret.empty())
       ret += " | ";
     ret += base::IntToString(effects);
   }
 
   return ret;
 }
 
+std::string FormatToString(media::AudioParameters::Format format) {
+  switch (format) {
+    case media::AudioParameters::AUDIO_PCM_LINEAR:
+      return "pcm_linear";
+    case media::AudioParameters::AUDIO_PCM_LOW_LATENCY:
+      return "pcm_low_latency";
+    case media::AudioParameters::AUDIO_FAKE:
+      return "fake";
+    default:
+      break;

[watk, 2015/02/05 20:48:44]

Maybe you could remove the default case so we get a compiler warning if we add a
Format but forget to add a case here?

[DaleCurtis, 2015/02/05 21:14:54]

Good idea. Added a NOTREACHED() too.

+  }
+
+  return "unknown";
+}
+
 const char kAudioLogStatusKey[] = "status";
 const char kAudioLogUpdateFunction[] = "media.updateAudioComponent";
 
 }  // namespace
 
 namespace content {
 
 class AudioLogImpl : public media::AudioLog {
  public:
   AudioLogImpl(int owner_id,
@@ skipping 34 matching lines @@
 AudioLogImpl::~AudioLogImpl() {}
 
 void AudioLogImpl::OnCreated(int component_id,
                              const media::AudioParameters& params,
                              const std::string& device_id) {
   base::DictionaryValue dict;
   StoreComponentMetadata(component_id, &dict);
 
   dict.SetString(kAudioLogStatusKey, "created");
   dict.SetString("device_id", device_id);
+  dict.SetString("device_type", FormatToString(params.format()));
   dict.SetInteger("frames_per_buffer", params.frames_per_buffer());
   dict.SetInteger("sample_rate", params.sample_rate());
   dict.SetInteger("channels", params.channels());
   dict.SetString("channel_layout",
                  ChannelLayoutToString(params.channel_layout()));
   dict.SetString("effects", EffectsToString(params.effects()));
 
   media_internals_->SendUpdateAndCacheAudioStreamKey(
       FormatCacheKey(component_id), kAudioLogUpdateFunction, &dict);
 }
@@ skipping 394 matching lines @@
     const std::string& function,
     const base::DictionaryValue* value) {
   SendUpdate(SerializeUpdate(function, value));
 
   base::AutoLock auto_lock(lock_);
   scoped_ptr<base::Value> out_value;
   CHECK(audio_streams_cached_data_.Remove(cache_key, &out_value));
 }
 
 }  // namespace content