| 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 <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 kCodecPCM, | 23 kCodecPCM, |
| 24 kCodecVorbis, | 24 kCodecVorbis, |
| 25 kCodecFLAC, | 25 kCodecFLAC, |
| 26 kCodecAMR_NB, | 26 kCodecAMR_NB, |
| 27 kCodecAMR_WB, | 27 kCodecAMR_WB, |
| 28 kCodecPCM_MULAW, | 28 kCodecPCM_MULAW, |
| 29 kCodecGSM_MS, | 29 kCodecGSM_MS, |
| 30 kCodecPCM_S16BE, | 30 kCodecPCM_S16BE, |
| 31 kCodecPCM_S24BE, | 31 kCodecPCM_S24BE, |
| 32 kCodecOpus, | 32 kCodecOpus, |
| 33 kCodecEAC3, |
| 33 // DO NOT ADD RANDOM AUDIO CODECS! | 34 // DO NOT ADD RANDOM AUDIO CODECS! |
| 34 // | 35 // |
| 35 // The only acceptable time to add a new codec is if there is production code | 36 // The only acceptable time to add a new codec is if there is production code |
| 36 // that uses said codec in the same CL. | 37 // that uses said codec in the same CL. |
| 37 | 38 |
| 38 // Must always be last! | 39 // Must always be last! |
| 39 kAudioCodecMax | 40 kAudioCodecMax |
| 40 }; | 41 }; |
| 41 | 42 |
| 42 enum SampleFormat { | 43 enum SampleFormat { |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 bool is_encrypted_; | 118 bool is_encrypted_; |
| 118 | 119 |
| 119 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler | 120 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler |
| 120 // generated copy constructor and assignment operator. Since the extra data is | 121 // generated copy constructor and assignment operator. Since the extra data is |
| 121 // typically small, the performance impact is minimal. | 122 // typically small, the performance impact is minimal. |
| 122 }; | 123 }; |
| 123 | 124 |
| 124 } // namespace media | 125 } // namespace media |
| 125 | 126 |
| 126 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ | 127 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ |
| OLD | NEW |