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" |
(...skipping 12 matching lines...) Expand all Loading... | |
23 kCodecVorbis, | 23 kCodecVorbis, |
24 // ChromiumOS and ChromeOS specific codecs. | 24 // ChromiumOS and ChromeOS specific codecs. |
25 kCodecFLAC, | 25 kCodecFLAC, |
26 // ChromeOS specific codecs. | 26 // ChromeOS specific codecs. |
27 kCodecAMR_NB, | 27 kCodecAMR_NB, |
28 kCodecAMR_WB, | 28 kCodecAMR_WB, |
29 kCodecPCM_MULAW, | 29 kCodecPCM_MULAW, |
30 kCodecGSM_MS, | 30 kCodecGSM_MS, |
31 kCodecPCM_S16BE, | 31 kCodecPCM_S16BE, |
32 kCodecPCM_S24BE, | 32 kCodecPCM_S24BE, |
33 kCodecOpus, | |
xhwang
2012/12/12 22:16:10
This is ChromeOS specific?
Tom Finegan
2012/12/13 06:18:14
Oops, missed that the section I dropped this in wa
| |
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 kAudioCodecMax = kCodecPCM_S24BE // Must equal the last "real" codec above. | 39 kAudioCodecMax = kCodecOpus // Must equal the last "real" codec above. |
39 }; | 40 }; |
40 | 41 |
41 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of | 42 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of |
42 // |bits_per_channel|, we should switch over since bits are generally confusing | 43 // |bits_per_channel|, we should switch over since bits are generally confusing |
43 // to work with. | 44 // to work with. |
44 class MEDIA_EXPORT AudioDecoderConfig { | 45 class MEDIA_EXPORT AudioDecoderConfig { |
45 public: | 46 public: |
46 // Constructs an uninitialized object. Clients should call Initialize() with | 47 // Constructs an uninitialized object. Clients should call Initialize() with |
47 // appropriate values before using. | 48 // appropriate values before using. |
48 AudioDecoderConfig(); | 49 AudioDecoderConfig(); |
(...skipping 52 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 |