| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2017 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2017 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_ORTC_RTPPARAMETERSCONVERSION_H_ | 11 #ifndef WEBRTC_ORTC_RTPPARAMETERSCONVERSION_H_ |
| 12 #define WEBRTC_ORTC_RTPPARAMETERSCONVERSION_H_ | 12 #define WEBRTC_ORTC_RTPPARAMETERSCONVERSION_H_ |
| 13 | 13 |
| 14 #include <memory> | 14 #include <memory> |
| 15 #include <vector> | 15 #include <vector> |
| 16 | 16 |
| 17 #include "webrtc/api/rtcerror.h" | 17 #include "webrtc/api/rtcerror.h" |
| 18 #include "webrtc/api/rtpparameters.h" | 18 #include "webrtc/api/rtpparameters.h" |
| 19 #include "webrtc/base/optional.h" | 19 #include "webrtc/base/optional.h" |
| 20 #include "webrtc/media/base/codec.h" |
| 20 #include "webrtc/pc/mediasession.h" | 21 #include "webrtc/pc/mediasession.h" |
| 21 #include "webrtc/media/base/codec.h" | |
| 22 | 22 |
| 23 namespace webrtc { | 23 namespace webrtc { |
| 24 | 24 |
| 25 // NOTE: Some functions are templated for convenience, such that template-based | 25 // NOTE: Some functions are templated for convenience, such that template-based |
| 26 // code dealing with AudioContentDescription and VideoContentDescription can | 26 // code dealing with AudioContentDescription and VideoContentDescription can |
| 27 // use this easily. Such methods are usable with cricket::AudioCodec and | 27 // use this easily. Such methods are usable with cricket::AudioCodec and |
| 28 // cricket::VideoCodec. | 28 // cricket::VideoCodec. |
| 29 | 29 |
| 30 //*************************************************************************** | 30 //*************************************************************************** |
| 31 // Functions for converting from new webrtc:: structures to old cricket:: | 31 // Functions for converting from new webrtc:: structures to old cricket:: |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 RtpCodecCapability ToRtpCodecCapability(const C& cricket_codec); | 87 RtpCodecCapability ToRtpCodecCapability(const C& cricket_codec); |
| 88 | 88 |
| 89 template <class C> | 89 template <class C> |
| 90 RtpCapabilities ToRtpCapabilities( | 90 RtpCapabilities ToRtpCapabilities( |
| 91 const std::vector<C>& cricket_codecs, | 91 const std::vector<C>& cricket_codecs, |
| 92 const cricket::RtpHeaderExtensions& cricket_extensions); | 92 const cricket::RtpHeaderExtensions& cricket_extensions); |
| 93 | 93 |
| 94 } // namespace webrtc | 94 } // namespace webrtc |
| 95 | 95 |
| 96 #endif // WEBRTC_ORTC_RTPPARAMETERSCONVERSION_H_ | 96 #endif // WEBRTC_ORTC_RTPPARAMETERSCONVERSION_H_ |
| OLD | NEW |