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

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 the switces for android g++ 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
« no previous file with comments | « media/base/audio_decoder_config.h ('k') | media/base/video_decoder_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..d77d8da565a3828cd08ab6f627d482ae7d8f9413 100644
--- a/media/base/audio_decoder_config.cc
+++ b/media/base/audio_decoder_config.cc
@@ -108,7 +108,7 @@ bool AudioDecoderConfig::Matches(const AudioDecoderConfig& config) const {
std::string AudioDecoderConfig::AsHumanReadableString() const {
std::ostringstream s;
- s << "codec: " << codec()
+ s << "codec: " << GetHumanReadableCodecName()
<< " bytes_per_channel: " << bytes_per_channel()
<< " channel_layout: " << channel_layout()
<< " samples_per_second: " << samples_per_second()
@@ -121,4 +121,38 @@ std::string AudioDecoderConfig::AsHumanReadableString() const {
return s.str();
}
+// These names come from src/third_party/ffmpeg/libavcodec/codec_desc.c
+std::string AudioDecoderConfig::GetHumanReadableCodecName() const {
+ switch (codec()) {
+ case kUnknownAudioCodec:
+ return "unknown";
+ case kCodecAAC:
+ return "aac";
+ case kCodecMP3:
+ return "mp3";
+ case kCodecPCM:
+ case kCodecPCM_S16BE:
+ case kCodecPCM_S24BE:
+ return "pcm";
+ 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";
+ }
+ NOTREACHED();
+ return "";
+}
+
} // namespace media
« no previous file with comments | « media/base/audio_decoder_config.h ('k') | media/base/video_decoder_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698