| 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 #include "webrtc/ortc/rtptransportcontrolleradapter.h" | 11 #include "webrtc/ortc/rtptransportcontrolleradapter.h" |
| 12 | 12 |
| 13 #include <algorithm> // For "remove", "find". | 13 #include <algorithm> // For "remove", "find". |
| 14 #include <set> | 14 #include <set> |
| 15 #include <sstream> | 15 #include <sstream> |
| 16 #include <unordered_map> | 16 #include <unordered_map> |
| 17 #include <utility> // For std::move. | 17 #include <utility> // For std::move. |
| 18 | 18 |
| 19 #include "webrtc/api/proxy.h" | 19 #include "webrtc/api/proxy.h" |
| 20 #include "webrtc/base/checks.h" | |
| 21 #include "webrtc/media/base/mediaconstants.h" | 20 #include "webrtc/media/base/mediaconstants.h" |
| 22 #include "webrtc/ortc/ortcrtpreceiveradapter.h" | 21 #include "webrtc/ortc/ortcrtpreceiveradapter.h" |
| 23 #include "webrtc/ortc/ortcrtpsenderadapter.h" | 22 #include "webrtc/ortc/ortcrtpsenderadapter.h" |
| 24 #include "webrtc/ortc/rtpparametersconversion.h" | 23 #include "webrtc/ortc/rtpparametersconversion.h" |
| 25 #include "webrtc/ortc/rtptransportadapter.h" | 24 #include "webrtc/ortc/rtptransportadapter.h" |
| 25 #include "webrtc/rtc_base/checks.h" |
| 26 | 26 |
| 27 namespace webrtc { | 27 namespace webrtc { |
| 28 | 28 |
| 29 // Note: It's assumed that each individual list doesn't have conflicts, since | 29 // Note: It's assumed that each individual list doesn't have conflicts, since |
| 30 // they should have been detected already by rtpparametersconversion.cc. This | 30 // they should have been detected already by rtpparametersconversion.cc. This |
| 31 // only needs to detect conflicts *between* A and B. | 31 // only needs to detect conflicts *between* A and B. |
| 32 template <typename C1, typename C2> | 32 template <typename C1, typename C2> |
| 33 static RTCError CheckForIdConflicts( | 33 static RTCError CheckForIdConflicts( |
| 34 const std::vector<C1>& codecs_a, | 34 const std::vector<C1>& codecs_a, |
| 35 const cricket::RtpHeaderExtensions& extensions_a, | 35 const cricket::RtpHeaderExtensions& extensions_a, |
| (...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 974 local_description->set_cryptos(cryptos); | 974 local_description->set_cryptos(cryptos); |
| 975 | 975 |
| 976 cryptos.clear(); | 976 cryptos.clear(); |
| 977 cryptos.push_back(*(rtp_transport->GetInternal()->send_key())); | 977 cryptos.push_back(*(rtp_transport->GetInternal()->send_key())); |
| 978 remote_description->set_cryptos(cryptos); | 978 remote_description->set_cryptos(cryptos); |
| 979 } | 979 } |
| 980 return RTCError::OK(); | 980 return RTCError::OK(); |
| 981 } | 981 } |
| 982 | 982 |
| 983 } // namespace webrtc | 983 } // namespace webrtc |
| OLD | NEW |