Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Unified Diff: media/base/audio_decoder_config.cc

Issue 743483002: Emit Media Source codec names as media_log events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix missed call to ChunkDemuxer constructor. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/audio_decoder_config.cc
diff --git a/media/base/audio_decoder_config.cc b/media/base/audio_decoder_config.cc
index 06a1643f0a1ae4c2cf1b869dbf87fd9a02c42024..952cbf3ffde3782f5fc921b9a82aca8a32ba8d6d 100644
--- a/media/base/audio_decoder_config.cc
+++ b/media/base/audio_decoder_config.cc
@@ -13,6 +13,59 @@
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 thes
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),

Powered by Google App Engine
This is Rietveld 408576698