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 #ifndef MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ | 5 #ifndef MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ |
6 #define MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ | 6 #define MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "media/base/channel_layout.h" | 10 #include "media/base/channel_layout.h" |
11 #include "media/base/media_export.h" | 11 #include "media/base/media_export.h" |
12 | 12 |
13 namespace media { | 13 namespace media { |
14 | 14 |
15 enum AudioCodec { | 15 enum AudioCodec { |
16 // These values are histogrammed over time; do not change their ordinal | 16 // These values are histogrammed over time; do not change their ordinal |
17 // values. When deleting a codec replace it with a dummy value; when adding a | 17 // values. When deleting a codec replace it with a dummy value; when adding a |
18 // codec, do so at the bottom (and update kAudioCodecMax). | 18 // codec, do so at the bottom (and update kAudioCodecMax). |
19 kUnknownAudioCodec = 0, | 19 kUnknownAudioCodec = 0, |
20 kCodecAAC, | 20 kCodecAAC, |
21 kCodecMP3, | 21 kCodecMP3, |
22 kCodecPCM, | 22 kCodecPCM, |
23 kCodecVorbis, | 23 kCodecVorbis, |
24 kCodecOpus, | |
xhwang
2012/12/13 08:33:13
I am not sure if this is okay given the comments i
fgalligan1
2012/12/13 22:30:14
I think you are right. I think this needs to go af
Tom Finegan
2012/12/13 23:20:00
Heh. I should have actually read the comments in h
| |
24 // ChromiumOS and ChromeOS specific codecs. | 25 // ChromiumOS and ChromeOS specific codecs. |
25 kCodecFLAC, | 26 kCodecFLAC, |
26 // ChromeOS specific codecs. | 27 // ChromeOS specific codecs. |
27 kCodecAMR_NB, | 28 kCodecAMR_NB, |
28 kCodecAMR_WB, | 29 kCodecAMR_WB, |
29 kCodecPCM_MULAW, | 30 kCodecPCM_MULAW, |
30 kCodecGSM_MS, | 31 kCodecGSM_MS, |
31 kCodecPCM_S16BE, | 32 kCodecPCM_S16BE, |
32 kCodecPCM_S24BE, | 33 kCodecPCM_S24BE, |
33 // DO NOT ADD RANDOM AUDIO CODECS! | 34 // DO NOT ADD RANDOM AUDIO CODECS! |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
101 size_t extra_data_size_; | 102 size_t extra_data_size_; |
102 | 103 |
103 bool is_encrypted_; | 104 bool is_encrypted_; |
104 | 105 |
105 DISALLOW_COPY_AND_ASSIGN(AudioDecoderConfig); | 106 DISALLOW_COPY_AND_ASSIGN(AudioDecoderConfig); |
106 }; | 107 }; |
107 | 108 |
108 } // namespace media | 109 } // namespace media |
109 | 110 |
110 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ | 111 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ |
OLD | NEW |