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

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

Issue 1563893003: media: Fix case ordering of switch statements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 2 Created 4 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
« no previous file with comments | « no previous file | media/base/mime_util.cc » ('j') | media/base/mime_util.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "media/base/limits.h" 8 #include "media/base/limits.h"
9 9
10 namespace media { 10 namespace media {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 // These names come from src/third_party/ffmpeg/libavcodec/codec_desc.c 96 // These names come from src/third_party/ffmpeg/libavcodec/codec_desc.c
97 std::string AudioDecoderConfig::GetHumanReadableCodecName() const { 97 std::string AudioDecoderConfig::GetHumanReadableCodecName() const {
98 switch (codec()) { 98 switch (codec()) {
99 case kUnknownAudioCodec: 99 case kUnknownAudioCodec:
100 return "unknown"; 100 return "unknown";
101 case kCodecAAC: 101 case kCodecAAC:
102 return "aac"; 102 return "aac";
103 case kCodecMP3: 103 case kCodecMP3:
104 return "mp3"; 104 return "mp3";
105 case kCodecPCM: 105 case kCodecPCM:
106 case kCodecPCM_S16BE:
107 case kCodecPCM_S24BE:
108 return "pcm"; 106 return "pcm";
109 case kCodecVorbis: 107 case kCodecVorbis:
110 return "vorbis"; 108 return "vorbis";
111 case kCodecFLAC: 109 case kCodecFLAC:
112 return "flac"; 110 return "flac";
113 case kCodecAMR_NB: 111 case kCodecAMR_NB:
114 return "amr_nb"; 112 return "amr_nb";
115 case kCodecAMR_WB: 113 case kCodecAMR_WB:
116 return "amr_wb"; 114 return "amr_wb";
115 case kCodecPCM_MULAW:
116 return "pcm_mulaw";
117 case kCodecGSM_MS: 117 case kCodecGSM_MS:
118 return "gsm_ms"; 118 return "gsm_ms";
119 case kCodecPCM_S16BE:
120 return "pcm";
ddorwin 2016/01/07 19:44:11 Even though they would be out of order, I think it
servolk 2016/01/07 22:08:04 Done.
121 case kCodecPCM_S24BE:
122 return "pcm";
123 case kCodecOpus:
124 return "opus";
119 case kCodecPCM_ALAW: 125 case kCodecPCM_ALAW:
120 return "pcm_alaw"; 126 return "pcm_alaw";
121 case kCodecPCM_MULAW:
122 return "pcm_mulaw";
123 case kCodecOpus:
124 return "opus";
125 case kCodecALAC: 127 case kCodecALAC:
126 return "alac"; 128 return "alac";
127 } 129 }
128 NOTREACHED(); 130 NOTREACHED();
129 return ""; 131 return "";
130 } 132 }
131 133
132 } // namespace media 134 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | media/base/mime_util.cc » ('j') | media/base/mime_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698