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

Unified Diff: webrtc/ortc/rtptransportadapter.h

Issue 2981513002: Wire up RTP keep-alive in ortc api. (Closed)
Patch Set: deps, again Created 3 years, 4 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
« no previous file with comments | « webrtc/ortc/rtptransport_unittest.cc ('k') | webrtc/ortc/rtptransportadapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « webrtc/ortc/rtptransport_unittest.cc ('k') | webrtc/ortc/rtptransportadapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698