Emit Media Source codec names as media_log events.

media/base/audio_decoder_config.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 "media/base/audio_decoder_config.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "media/audio/sample_rates.h"
 #include "media/base/limits.h"
 #include "media/base/sample_format.h"
 
 namespace media {
 
+// The names come from src/third_party/ffmpeg/libavcodec/codec_desc.c
+const char* AudioCodecName(AudioCodec audio_codec, SampleFormat sample_format) {
+  switch (audio_codec) {
+    case kCodecAAC:
+      return "aac";
+    case kCodecMP3:
+      return "mp3";
+    case kCodecPCM:
+      switch (sample_format) {

[DaleCurtis, 2014/11/19 00:01:56]

I wouldn't really worry about differentiating these, just saying pcm is fine.

[watk, 2014/11/19 19:18:09]

Done.

+        case kUnknownSampleFormat:
+          return "pcm";
+        case kSampleFormatU8:
+          return "pcm_u8";
+        case kSampleFormatS16:
+          return "pcm_s16le";
+        case kSampleFormatS32:
+          return "pcm_s24le";
+        case kSampleFormatF32:
+          return "pcm_f32le";
+        case kSampleFormatPlanarS16:
+          return "pcm_s16le_planar";
+        case kSampleFormatPlanarF32:
+          return "pcm_f32le_planar";
+        default:
+          NOTREACHED() << "Invalid SampleFormat: " << sample_format;
+          return "pcm";
+      }
+    case kCodecPCM_S16BE:
+      return "pcm_s16be";
+    case kCodecPCM_S24BE:
+      return "pcm_s24be";
+    case kCodecVorbis:
+      return "vorbis";
+    case kCodecFLAC:
+      return "flac";
+    case kCodecAMR_NB:
+      return "amr_nb";
+    case kCodecAMR_WB:
+      return "amr_wb";
+    case kCodecGSM_MS:
+      return "gsm_ms";
+    case kCodecPCM_ALAW:
+      return "pcm_alaw";
+    case kCodecPCM_MULAW:
+      return "pcm_mulaw";
+    case kCodecOpus:
+      return "opus";
+    default:
+      NOTREACHED() << "Invalid AudioCodec: " << audio_codec;
+      return "unknown";
+  }
+}
+
 AudioDecoderConfig::AudioDecoderConfig()
     : codec_(kUnknownAudioCodec),
       sample_format_(kUnknownSampleFormat),
       bytes_per_channel_(0),
       channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED),
       samples_per_second_(0),
       bytes_per_frame_(0),
       is_encrypted_(false),
       codec_delay_(0) {
 }
@@ skipping 89 matching lines @@
     << " sample_format: " << sample_format()
     << " bytes_per_frame: " << bytes_per_frame()
     << " seek_preroll: " << seek_preroll().InMilliseconds() << "ms"
     << " codec_delay: " << codec_delay()
     << " has extra data? " << (extra_data() ? "true" : "false")
     << " encrypted? " << (is_encrypted() ? "true" : "false");
   return s.str();
 }
 
 }  // namespace media