| 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 // TODO(kwiberg): Get rid of the default constructor when rtc::Optional no | |
| 27 // longer requires it. | |
| 28 SdpAudioFormat(); | |
| 29 SdpAudioFormat(const SdpAudioFormat&); | 26 SdpAudioFormat(const SdpAudioFormat&); |
| 30 SdpAudioFormat(SdpAudioFormat&&); | 27 SdpAudioFormat(SdpAudioFormat&&); |
| 31 SdpAudioFormat(const char* name, int clockrate_hz, int num_channels); | 28 SdpAudioFormat(const char* name, int clockrate_hz, int num_channels); |
| 32 SdpAudioFormat(const char* name, | 29 SdpAudioFormat(const char* name, |
| 33 int clockrate_hz, | 30 int clockrate_hz, |
| 34 int num_channels, | 31 int num_channels, |
| 35 Parameters&& param); | 32 Parameters&& param); |
| 36 ~SdpAudioFormat(); | 33 ~SdpAudioFormat(); |
| 37 | 34 |
| 38 SdpAudioFormat& operator=(const SdpAudioFormat&); | 35 SdpAudioFormat& operator=(const SdpAudioFormat&); |
| 39 SdpAudioFormat& operator=(SdpAudioFormat&&); | 36 SdpAudioFormat& operator=(SdpAudioFormat&&); |
| 40 | 37 |
| 41 std::string name; | 38 std::string name; |
| 42 int clockrate_hz; | 39 int clockrate_hz; |
| 43 int num_channels; | 40 int num_channels; |
| 44 Parameters parameters; | 41 Parameters parameters; |
| 45 // Parameters feedback_parameters; ?? | 42 // Parameters feedback_parameters; ?? |
| 46 }; | 43 }; |
| 47 | 44 |
| 48 void swap(SdpAudioFormat& a, SdpAudioFormat& b); | 45 void swap(SdpAudioFormat& a, SdpAudioFormat& b); |
| 49 std::ostream& operator<<(std::ostream& os, const SdpAudioFormat& saf); | 46 std::ostream& operator<<(std::ostream& os, const SdpAudioFormat& saf); |
| 50 | 47 |
| 51 } // namespace webrtc | 48 } // namespace webrtc |
| 52 | 49 |
| 53 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_H_ | 50 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_H_ |
| OLD | NEW |