| Index: webrtc/pc/rtptransport.cc
|
| diff --git a/webrtc/pc/rtptransport.cc b/webrtc/pc/rtptransport.cc
|
| index 8a524dd07a3ab177ca95fb547c9e80adb7727ac7..8857d10144bac443129bc3ba652a7ac97c4893f4 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() {
|
|
|