| 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 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 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 char* name, | 29 SdpAudioFormat(const char* name, |
| 30 int clockrate_hz, | 30 int clockrate_hz, |
| 31 int num_channels, | 31 int num_channels, |
| 32 Parameters&& param); | 32 Parameters&& param); |
| 33 ~SdpAudioFormat(); | 33 ~SdpAudioFormat(); |
| 34 | 34 |
| 35 SdpAudioFormat& operator=(const SdpAudioFormat&); | 35 SdpAudioFormat& operator=(const SdpAudioFormat&); |
| 36 SdpAudioFormat& operator=(SdpAudioFormat&&); | 36 SdpAudioFormat& operator=(SdpAudioFormat&&); |
| 37 | 37 |
| 38 friend bool operator==(const SdpAudioFormat& a, const SdpAudioFormat& b); |
| 39 friend bool operator!=(const SdpAudioFormat& a, const SdpAudioFormat& b) { |
| 40 return !(a == b); |
| 41 } |
| 42 |
| 38 std::string name; | 43 std::string name; |
| 39 int clockrate_hz; | 44 int clockrate_hz; |
| 40 int num_channels; | 45 int num_channels; |
| 41 Parameters parameters; | 46 Parameters parameters; |
| 42 }; | 47 }; |
| 43 | 48 |
| 44 void swap(SdpAudioFormat& a, SdpAudioFormat& b); | 49 void swap(SdpAudioFormat& a, SdpAudioFormat& b); |
| 45 std::ostream& operator<<(std::ostream& os, const SdpAudioFormat& saf); | 50 std::ostream& operator<<(std::ostream& os, const SdpAudioFormat& saf); |
| 46 | 51 |
| 47 struct AudioCodecSpec { | 52 struct AudioCodecSpec { |
| 48 SdpAudioFormat format; | 53 SdpAudioFormat format; |
| 49 bool allow_comfort_noise; // This encoder can be used with an external | 54 bool allow_comfort_noise; // This encoder can be used with an external |
| 50 // comfort noise generator. | 55 // comfort noise generator. |
| 51 }; | 56 }; |
| 52 | 57 |
| 53 } // namespace webrtc | 58 } // namespace webrtc |
| 54 | 59 |
| 55 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_H_ | 60 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_H_ |
| OLD | NEW |