| 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 15 matching lines...) Expand all  Loading... | 
| 26   kCodecVorbis, | 26   kCodecVorbis, | 
| 27   kCodecFLAC, | 27   kCodecFLAC, | 
| 28   kCodecAMR_NB, | 28   kCodecAMR_NB, | 
| 29   kCodecAMR_WB, | 29   kCodecAMR_WB, | 
| 30   kCodecPCM_MULAW, | 30   kCodecPCM_MULAW, | 
| 31   kCodecGSM_MS, | 31   kCodecGSM_MS, | 
| 32   kCodecPCM_S16BE, | 32   kCodecPCM_S16BE, | 
| 33   kCodecPCM_S24BE, | 33   kCodecPCM_S24BE, | 
| 34   kCodecOpus, | 34   kCodecOpus, | 
| 35   kCodecEAC3, | 35   kCodecEAC3, | 
|  | 36   kCodecPCM_ALAW, | 
| 36   // DO NOT ADD RANDOM AUDIO CODECS! | 37   // DO NOT ADD RANDOM AUDIO CODECS! | 
| 37   // | 38   // | 
| 38   // The only acceptable time to add a new codec is if there is production code | 39   // The only acceptable time to add a new codec is if there is production code | 
| 39   // that uses said codec in the same CL. | 40   // that uses said codec in the same CL. | 
| 40 | 41 | 
| 41   // Must always be last! | 42   // Must always be last! | 
| 42   kAudioCodecMax | 43   kAudioCodecMax | 
| 43 }; | 44 }; | 
| 44 | 45 | 
| 45 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of | 46 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of | 
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 118   base::TimeDelta codec_delay_; | 119   base::TimeDelta codec_delay_; | 
| 119 | 120 | 
| 120   // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler | 121   // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler | 
| 121   // generated copy constructor and assignment operator. Since the extra data is | 122   // generated copy constructor and assignment operator. Since the extra data is | 
| 122   // typically small, the performance impact is minimal. | 123   // typically small, the performance impact is minimal. | 
| 123 }; | 124 }; | 
| 124 | 125 | 
| 125 }  // namespace media | 126 }  // namespace media | 
| 126 | 127 | 
| 127 #endif  // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ | 128 #endif  // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ | 
| OLD | NEW | 
|---|