Index: webrtc/ortc/rtptransportadapter.h |
diff --git a/webrtc/ortc/rtptransportadapter.h b/webrtc/ortc/rtptransportadapter.h |
index 6fbc162e999895b940afa4d1c1f058a9e13bdeab..c71a4f41cf5a2570e11e88d33f60ff6f532e0f3a 100644 |
--- a/webrtc/ortc/rtptransportadapter.h |
+++ b/webrtc/ortc/rtptransportadapter.h |
@@ -36,13 +36,13 @@ class RtpTransportAdapter : public SrtpTransportInterface { |
// |rtp| can't be null. |rtcp| can if RTCP muxing is used immediately (meaning |
// |rtcp_parameters.mux| is also true). |
static RTCErrorOr<std::unique_ptr<RtpTransportInterface>> CreateProxied( |
- const RtcpParameters& rtcp_parameters, |
+ const RtpTransportParameters& rtcp_parameters, |
PacketTransportInterface* rtp, |
PacketTransportInterface* rtcp, |
RtpTransportControllerAdapter* rtp_transport_controller); |
static RTCErrorOr<std::unique_ptr<SrtpTransportInterface>> CreateSrtpProxied( |
- const RtcpParameters& rtcp_parameters, |
+ const RtpTransportParameters& rtcp_parameters, |
PacketTransportInterface* rtp, |
PacketTransportInterface* rtcp, |
RtpTransportControllerAdapter* rtp_transport_controller); |
@@ -52,8 +52,8 @@ class RtpTransportAdapter : public SrtpTransportInterface { |
// RtpTransportInterface implementation. |
PacketTransportInterface* GetRtpPacketTransport() const override; |
PacketTransportInterface* GetRtcpPacketTransport() const override; |
- RTCError SetRtcpParameters(const RtcpParameters& parameters) override; |
- RtcpParameters GetRtcpParameters() const override { return rtcp_parameters_; } |
+ RTCError SetParameters(const RtpTransportParameters& parameters) override; |
+ RtpTransportParameters GetParameters() const override { return parameters_; } |
// SRTP specific implementation. |
RTCError SetSrtpSendKey(const cricket::CryptoParams& params) override; |
@@ -82,7 +82,7 @@ class RtpTransportAdapter : public SrtpTransportInterface { |
RtpTransportAdapter* GetInternal() override { return this; } |
private: |
- RtpTransportAdapter(const RtcpParameters& rtcp_parameters, |
+ RtpTransportAdapter(const RtcpParameters& rtcp_params, |
PacketTransportInterface* rtp, |
PacketTransportInterface* rtcp, |
RtpTransportControllerAdapter* rtp_transport_controller, |
@@ -90,11 +90,11 @@ class RtpTransportAdapter : public SrtpTransportInterface { |
PacketTransportInterface* rtp_packet_transport_; |
PacketTransportInterface* rtcp_packet_transport_; |
- RtpTransportControllerAdapter* rtp_transport_controller_; |
+ RtpTransportControllerAdapter* const rtp_transport_controller_; |
// Non-null if this class owns the transport controller. |
std::unique_ptr<RtpTransportControllerInterface> |
owned_rtp_transport_controller_; |
- RtcpParameters rtcp_parameters_; |
+ RtpTransportParameters parameters_; |
// SRTP specific members. |
rtc::Optional<cricket::CryptoParams> send_key_; |