Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3304)

Unified Diff: webrtc/pc/rtptransport.cc

Issue 2981513002: Wire up RTP keep-alive in ortc api. (Closed)
Patch Set: Moved RtcpParameters into RtpTransportParameters Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/pc/rtptransport.cc
diff --git a/webrtc/pc/rtptransport.cc b/webrtc/pc/rtptransport.cc
index d530c73c50a54df4c86269da928359003f4996fd..41db044665ba0a71e5b7c592c73a27aa29c6a07f 100644
--- a/webrtc/pc/rtptransport.cc
+++ b/webrtc/pc/rtptransport.cc
@@ -115,24 +115,30 @@ PacketTransportInterface* RtpTransport::GetRtcpPacketTransport() const {
return rtcp_packet_transport_;
}
-RTCError RtpTransport::SetRtcpParameters(const RtcpParameters& parameters) {
- if (rtcp_parameters_.mux && !parameters.mux) {
+RTCError RtpTransport::SetParameters(const RtpTransportParameters& parameters) {
+ if (parameters_.rtcp.mux && !parameters.rtcp.mux) {
LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_STATE,
"Disabling RTCP muxing is not allowed.");
}
+ if (parameters_.keepalive.timeout_interval_ms > 0 &&
+ parameters_.keepalive != parameters.keepalive) {
+ LOG_AND_RETURN_ERROR(
+ RTCErrorType::INVALID_STATE,
+ "Cannot change RTP keep-alive parameters once enabled.");
+ }
- RtcpParameters new_parameters = parameters;
+ RtpTransportParameters new_parameters = parameters;
- if (new_parameters.cname.empty()) {
- new_parameters.cname = rtcp_parameters_.cname;
+ if (new_parameters.rtcp.cname.empty()) {
+ new_parameters.rtcp.cname = parameters_.rtcp.cname;
}
- rtcp_parameters_ = new_parameters;
+ parameters_ = new_parameters;
return RTCError::OK();
}
-RtcpParameters RtpTransport::GetRtcpParameters() const {
- return rtcp_parameters_;
+RtpTransportParameters RtpTransport::GetParameters() const {
+ return parameters_;
}
RtpTransportAdapter* RtpTransport::GetInternal() {

Powered by Google App Engine
This is Rietveld 408576698