media/base/audio_decoder_config.cc - Issue 812643005: Re-add AC3/EAC3 audio demuxing support

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: rebase Created 5 years 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

OLD	NEW
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 98 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
109 case kCodecVorbis:	109 case kCodecVorbis:

110 return "vorbis";	110 return "vorbis";

111 case kCodecFLAC:	111 case kCodecFLAC:

112 return "flac";	112 return "flac";

113 case kCodecAMR_NB:	113 case kCodecAMR_NB:

114 return "amr_nb";	114 return "amr_nb";

115 case kCodecAMR_WB:	115 case kCodecAMR_WB:

116 return "amr_wb";	116 return "amr_wb";

117 case kCodecGSM_MS:	117 case kCodecGSM_MS:

118 return "gsm_ms";	118 return "gsm_ms";

119 case kCodecPCM_ALAW:	119 case kCodecPCM_ALAW:
	ddorwin 2015/12/03 23:46:52 It looks like this one is out of order. Hmm. I won It looks like this one is out of order. Hmm. I wonder if others are as well. servolk 2015/12/21 17:50:57 Yep, some of these are out of order, but I'd rathe Show quoted text On 2015/12/03 23:46:52, ddorwin wrote: > It looks like this one is out of order. Hmm. I wonder if others are as well. Yep, some of these are out of order, but I'd rather keep this CL limited to AC3/EAC3 changes, so not changing it for now. servolk 2016/01/07 02:30:03 https://codereview.chromium.org/1563893003 Show quoted text On 2015/12/21 17:50:57, servolk wrote: > On 2015/12/03 23:46:52, ddorwin wrote: > > It looks like this one is out of order. Hmm. I wonder if others are as well. > > Yep, some of these are out of order, but I'd rather keep this CL limited to > AC3/EAC3 changes, so not changing it for now. https://codereview.chromium.org/1563893003
120 return "pcm_alaw";	120 return "pcm_alaw";

121 case kCodecPCM_MULAW:	121 case kCodecPCM_MULAW:

122 return "pcm_mulaw";	122 return "pcm_mulaw";

123 case kCodecOpus:	123 case kCodecOpus:

124 return "opus";	124 return "opus";

	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

OLD	NEW

« no previous file with comments | « media/base/audio_decoder_config.h ('k') | media/base/mime_util.cc » ('j') | media/base/mime_util.cc » ('J')