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 <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 15 matching lines...) Expand all Loading... |
26 kCodecPCM = 3, | 26 kCodecPCM = 3, |
27 kCodecVorbis = 4, | 27 kCodecVorbis = 4, |
28 kCodecFLAC = 5, | 28 kCodecFLAC = 5, |
29 kCodecAMR_NB = 6, | 29 kCodecAMR_NB = 6, |
30 kCodecAMR_WB = 7, | 30 kCodecAMR_WB = 7, |
31 kCodecPCM_MULAW = 8, | 31 kCodecPCM_MULAW = 8, |
32 kCodecGSM_MS = 9, | 32 kCodecGSM_MS = 9, |
33 kCodecPCM_S16BE = 10, | 33 kCodecPCM_S16BE = 10, |
34 kCodecPCM_S24BE = 11, | 34 kCodecPCM_S24BE = 11, |
35 kCodecOpus = 12, | 35 kCodecOpus = 12, |
36 // kCodecEAC3 = 13, | 36 kCodecEAC3 = 13, |
37 kCodecPCM_ALAW = 14, | 37 kCodecPCM_ALAW = 14, |
38 kCodecALAC = 15, | 38 kCodecALAC = 15, |
| 39 kCodecAC3 = 16, |
39 // DO NOT ADD RANDOM AUDIO CODECS! | 40 // DO NOT ADD RANDOM AUDIO CODECS! |
40 // | 41 // |
41 // The only acceptable time to add a new codec is if there is production code | 42 // The only acceptable time to add a new codec is if there is production code |
42 // that uses said codec in the same CL. | 43 // that uses said codec in the same CL. |
43 | 44 |
44 // Must always be equal to the largest entry ever logged. | 45 // Must always be equal to the largest entry ever logged. |
45 kAudioCodecMax = kCodecALAC, | 46 kAudioCodecMax = kCodecAC3, |
46 }; | 47 }; |
47 | 48 |
48 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of | 49 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of |
49 // |bits_per_channel|, we should switch over since bits are generally confusing | 50 // |bits_per_channel|, we should switch over since bits are generally confusing |
50 // to work with. | 51 // to work with. |
51 class MEDIA_EXPORT AudioDecoderConfig { | 52 class MEDIA_EXPORT AudioDecoderConfig { |
52 public: | 53 public: |
53 // Constructs an uninitialized object. Clients should call Initialize() with | 54 // Constructs an uninitialized object. Clients should call Initialize() with |
54 // appropriate values before using. | 55 // appropriate values before using. |
55 AudioDecoderConfig(); | 56 AudioDecoderConfig(); |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 int codec_delay_; | 128 int codec_delay_; |
128 | 129 |
129 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler | 130 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler |
130 // generated copy constructor and assignment operator. Since the extra data is | 131 // generated copy constructor and assignment operator. Since the extra data is |
131 // typically small, the performance impact is minimal. | 132 // typically small, the performance impact is minimal. |
132 }; | 133 }; |
133 | 134 |
134 } // namespace media | 135 } // namespace media |
135 | 136 |
136 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ | 137 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ |
OLD | NEW |