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

Side by Side Diff: media/base/audio_decoder_config.cc

Issue 812643005: Re-add AC3/EAC3 audio demuxing support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code cleanup Created 5 years, 11 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/audio_decoder_config.h" 5 #include "media/base/audio_decoder_config.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "media/audio/sample_rates.h" 10 #include "media/audio/sample_rates.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 return s.str(); 121 return s.str();
122 } 122 }
123 123
124 // These names come from src/third_party/ffmpeg/libavcodec/codec_desc.c 124 // These names come from src/third_party/ffmpeg/libavcodec/codec_desc.c
125 std::string AudioDecoderConfig::GetHumanReadableCodecName() const { 125 std::string AudioDecoderConfig::GetHumanReadableCodecName() const {
126 switch (codec()) { 126 switch (codec()) {
127 case kUnknownAudioCodec: 127 case kUnknownAudioCodec:
128 return "unknown"; 128 return "unknown";
129 case kCodecAAC: 129 case kCodecAAC:
130 return "aac"; 130 return "aac";
131 case kCodecAC3:
132 return "ac3";
133 case kCodecEAC3:
134 return "eac3";
131 case kCodecMP3: 135 case kCodecMP3:
132 return "mp3"; 136 return "mp3";
133 case kCodecPCM: 137 case kCodecPCM:
134 case kCodecPCM_S16BE: 138 case kCodecPCM_S16BE:
135 case kCodecPCM_S24BE: 139 case kCodecPCM_S24BE:
136 return "pcm"; 140 return "pcm";
137 case kCodecVorbis: 141 case kCodecVorbis:
138 return "vorbis"; 142 return "vorbis";
139 case kCodecFLAC: 143 case kCodecFLAC:
140 return "flac"; 144 return "flac";
141 case kCodecAMR_NB: 145 case kCodecAMR_NB:
142 return "amr_nb"; 146 return "amr_nb";
143 case kCodecAMR_WB: 147 case kCodecAMR_WB:
144 return "amr_wb"; 148 return "amr_wb";
145 case kCodecGSM_MS: 149 case kCodecGSM_MS:
146 return "gsm_ms"; 150 return "gsm_ms";
147 case kCodecPCM_ALAW: 151 case kCodecPCM_ALAW:
148 return "pcm_alaw"; 152 return "pcm_alaw";
149 case kCodecPCM_MULAW: 153 case kCodecPCM_MULAW:
150 return "pcm_mulaw"; 154 return "pcm_mulaw";
151 case kCodecOpus: 155 case kCodecOpus:
152 return "opus"; 156 return "opus";
153 } 157 }
154 NOTREACHED(); 158 NOTREACHED();
155 return ""; 159 return "";
156 } 160 }
157 161
158 } // namespace media 162 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698