OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_H_ |
12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_H_ | 12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_H_ |
13 | 13 |
14 #include <map> | 14 #include <map> |
15 #include <ostream> | 15 #include <ostream> |
16 #include <string> | 16 #include <string> |
17 #include <utility> | 17 #include <utility> |
18 | 18 |
19 namespace webrtc { | 19 namespace webrtc { |
20 | 20 |
21 // SDP specification for a single audio codec. | 21 // SDP specification for a single audio codec. |
22 // NOTE: This class is still under development and may change without notice. | 22 // NOTE: This class is still under development and may change without notice. |
23 struct SdpAudioFormat { | 23 struct SdpAudioFormat { |
24 using Parameters = std::map<std::string, std::string>; | 24 using Parameters = std::map<std::string, std::string>; |
25 | 25 |
26 SdpAudioFormat(const SdpAudioFormat&); | 26 SdpAudioFormat(const SdpAudioFormat&); |
27 SdpAudioFormat(SdpAudioFormat&&); | 27 SdpAudioFormat(SdpAudioFormat&&); |
28 SdpAudioFormat(const char* name, int clockrate_hz, int num_channels); | 28 SdpAudioFormat(const char* name, int clockrate_hz, int num_channels); |
| 29 SdpAudioFormat(const std::string& name, int clockrate_hz, int num_channels); |
29 SdpAudioFormat(const char* name, | 30 SdpAudioFormat(const char* name, |
30 int clockrate_hz, | 31 int clockrate_hz, |
31 int num_channels, | 32 int num_channels, |
32 Parameters&& param); | 33 const Parameters& param); |
| 34 SdpAudioFormat(const std::string& name, |
| 35 int clockrate_hz, |
| 36 int num_channels, |
| 37 const Parameters& param); |
33 ~SdpAudioFormat(); | 38 ~SdpAudioFormat(); |
34 | 39 |
35 SdpAudioFormat& operator=(const SdpAudioFormat&); | 40 SdpAudioFormat& operator=(const SdpAudioFormat&); |
36 SdpAudioFormat& operator=(SdpAudioFormat&&); | 41 SdpAudioFormat& operator=(SdpAudioFormat&&); |
37 | 42 |
38 friend bool operator==(const SdpAudioFormat& a, const SdpAudioFormat& b); | 43 friend bool operator==(const SdpAudioFormat& a, const SdpAudioFormat& b); |
39 friend bool operator!=(const SdpAudioFormat& a, const SdpAudioFormat& b) { | 44 friend bool operator!=(const SdpAudioFormat& a, const SdpAudioFormat& b) { |
40 return !(a == b); | 45 return !(a == b); |
41 } | 46 } |
42 | 47 |
43 std::string name; | 48 std::string name; |
44 int clockrate_hz; | 49 int clockrate_hz; |
45 int num_channels; | 50 int num_channels; |
46 Parameters parameters; | 51 Parameters parameters; |
47 }; | 52 }; |
48 | 53 |
49 void swap(SdpAudioFormat& a, SdpAudioFormat& b); | 54 void swap(SdpAudioFormat& a, SdpAudioFormat& b); |
50 std::ostream& operator<<(std::ostream& os, const SdpAudioFormat& saf); | 55 std::ostream& operator<<(std::ostream& os, const SdpAudioFormat& saf); |
51 | 56 |
52 struct AudioCodecSpec { | 57 struct AudioCodecSpec { |
53 SdpAudioFormat format; | 58 SdpAudioFormat format; |
54 bool allow_comfort_noise; // This encoder can be used with an external | 59 bool allow_comfort_noise; // This encoder can be used with an external |
55 // comfort noise generator. | 60 // comfort noise generator. |
56 }; | 61 }; |
57 | 62 |
58 } // namespace webrtc | 63 } // namespace webrtc |
59 | 64 |
60 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_H_ | 65 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_H_ |
OLD | NEW |