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

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: buildfix 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 | « media/base/audio_decoder_config.h ('k') | media/base/mime_util.cc » ('j') | no next file with comments »
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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 case kCodecAMR_WB: 115 case kCodecAMR_WB:
116 return "amr_wb"; 116 return "amr_wb";
117 case kCodecPCM_MULAW: 117 case kCodecPCM_MULAW:
118 return "pcm_mulaw"; 118 return "pcm_mulaw";
119 case kCodecGSM_MS: 119 case kCodecGSM_MS:
120 return "gsm_ms"; 120 return "gsm_ms";
121 case kCodecOpus: 121 case kCodecOpus:
122 return "opus"; 122 return "opus";
123 case kCodecPCM_ALAW: 123 case kCodecPCM_ALAW:
124 return "pcm_alaw"; 124 return "pcm_alaw";
125 case kCodecEAC3:
126 return "eac3";
125 case kCodecALAC: 127 case kCodecALAC:
126 return "alac"; 128 return "alac";
129 case kCodecAC3:
130 return "ac3";
127 } 131 }
128 NOTREACHED(); 132 NOTREACHED();
129 return ""; 133 return "";
130 } 134 }
131 135
132 } // namespace media 136 } // namespace media
OLDNEW
« no previous file with comments | « media/base/audio_decoder_config.h ('k') | media/base/mime_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698