Chromium Code Reviews| Index: webrtc/pc/rtptransport.cc |
| diff --git a/webrtc/pc/rtptransport.cc b/webrtc/pc/rtptransport.cc |
| index 8a524dd07a3ab177ca95fb547c9e80adb7727ac7..18976b6a9efa37c8d54cefc3e3b236e41c27795a 100644 |
| --- a/webrtc/pc/rtptransport.cc |
| +++ b/webrtc/pc/rtptransport.cc |
| @@ -115,24 +115,29 @@ 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 != parameters_.keepalive) { |
| + LOG_AND_RETURN_ERROR( |
| + RTCErrorType::INVALID_MODIFICATION, |
| + "RTP keep-alive parameters not supported by this channel."); |
|
Taylor Brandstetter
2017/08/03 01:18:04
Why is this message changing?
sprang_webrtc
2017/08/03 13:08:14
This is a new message. I just verify that you don'
Taylor Brandstetter
2017/08/03 16:50:36
Sorry, I thought this was RtpTransportAdapter when
|
| + } |
| - 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() { |