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

Side by Side Diff: webrtc/ortc/rtptransportcontrolleradapter.h

Issue 2981513002: Wire up RTP keep-alive in ortc api. (Closed)
Patch Set: Test 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2017 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 ~RtpTransportControllerAdapter() override; 70 ~RtpTransportControllerAdapter() override;
71 71
72 // RtpTransportControllerInterface implementation. 72 // RtpTransportControllerInterface implementation.
73 std::vector<RtpTransportInterface*> GetTransports() const override; 73 std::vector<RtpTransportInterface*> GetTransports() const override;
74 74
75 // These methods are used by OrtcFactory to create RtpTransports, RtpSenders 75 // These methods are used by OrtcFactory to create RtpTransports, RtpSenders
76 // and RtpReceivers using this controller. Called "CreateProxied" because 76 // and RtpReceivers using this controller. Called "CreateProxied" because
77 // these methods return proxies that will safely call methods on the correct 77 // these methods return proxies that will safely call methods on the correct
78 // thread. 78 // thread.
79 RTCErrorOr<std::unique_ptr<RtpTransportInterface>> CreateProxiedRtpTransport( 79 RTCErrorOr<std::unique_ptr<RtpTransportInterface>> CreateProxiedRtpTransport(
80 const RtcpParameters& rtcp_parameters, 80 const RtpTransportParameters& rtcp_parameters,
81 PacketTransportInterface* rtp, 81 PacketTransportInterface* rtp,
82 PacketTransportInterface* rtcp); 82 PacketTransportInterface* rtcp);
83 83
84 RTCErrorOr<std::unique_ptr<SrtpTransportInterface>> 84 RTCErrorOr<std::unique_ptr<SrtpTransportInterface>>
85 CreateProxiedSrtpTransport(const RtcpParameters& rtcp_parameters, 85 CreateProxiedSrtpTransport(const RtpTransportParameters& rtcp_parameters,
86 PacketTransportInterface* rtp, 86 PacketTransportInterface* rtp,
87 PacketTransportInterface* rtcp); 87 PacketTransportInterface* rtcp);
88 88
89 // |transport_proxy| needs to be a proxy to a transport because the 89 // |transport_proxy| needs to be a proxy to a transport because the
90 // application may call GetTransport() on the returned sender or receiver, 90 // application may call GetTransport() on the returned sender or receiver,
91 // and expects it to return a thread-safe transport proxy. 91 // and expects it to return a thread-safe transport proxy.
92 RTCErrorOr<std::unique_ptr<OrtcRtpSenderInterface>> CreateProxiedRtpSender( 92 RTCErrorOr<std::unique_ptr<OrtcRtpSenderInterface>> CreateProxiedRtpSender(
93 cricket::MediaType kind, 93 cricket::MediaType kind,
94 RtpTransportInterface* transport_proxy); 94 RtpTransportInterface* transport_proxy);
95 RTCErrorOr<std::unique_ptr<OrtcRtpReceiverInterface>> 95 RTCErrorOr<std::unique_ptr<OrtcRtpReceiverInterface>>
96 CreateProxiedRtpReceiver(cricket::MediaType kind, 96 CreateProxiedRtpReceiver(cricket::MediaType kind,
97 RtpTransportInterface* transport_proxy); 97 RtpTransportInterface* transport_proxy);
98 98
99 // Methods used internally by other "adapter" classes. 99 // Methods used internally by other "adapter" classes.
100 rtc::Thread* signaling_thread() const { return signaling_thread_; } 100 rtc::Thread* signaling_thread() const { return signaling_thread_; }
101 rtc::Thread* worker_thread() const { return worker_thread_; } 101 rtc::Thread* worker_thread() const { return worker_thread_; }
102 102
103 RTCError SetRtcpParameters(const RtcpParameters& parameters, 103 // |parameters.keepalive| will be set for ALL rtp transports in the call.
Taylor Brandstetter 2017/08/02 00:12:56 nit: Capitalize RTP.
sprang_webrtc 2017/08/02 16:45:08 Done.
104 RtpTransportInterface* inner_transport); 104 RTCError SetRtpTransportAndRtcpParameters(
105 const RtpTransportParameters& parameters,
106 RtpTransportInterface* inner_transport);
105 107
106 cricket::VoiceChannel* voice_channel() { return voice_channel_; } 108 cricket::VoiceChannel* voice_channel() { return voice_channel_; }
107 cricket::VideoChannel* video_channel() { return video_channel_; } 109 cricket::VideoChannel* video_channel() { return video_channel_; }
108 110
109 // |primary_ssrc| out parameter is filled with either 111 // |primary_ssrc| out parameter is filled with either
110 // |parameters.encodings[0].ssrc|, or a generated SSRC if that's left unset. 112 // |parameters.encodings[0].ssrc|, or a generated SSRC if that's left unset.
111 RTCError ValidateAndApplyAudioSenderParameters( 113 RTCError ValidateAndApplyAudioSenderParameters(
112 const RtpParameters& parameters, 114 const RtpParameters& parameters,
113 uint32_t* primary_ssrc); 115 uint32_t* primary_ssrc);
114 RTCError ValidateAndApplyVideoSenderParameters( 116 RTCError ValidateAndApplyVideoSenderParameters(
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 bool have_video_sender_ = false; 212 bool have_video_sender_ = false;
211 bool have_audio_receiver_ = false; 213 bool have_audio_receiver_ = false;
212 bool have_video_receiver_ = false; 214 bool have_video_receiver_ = false;
213 215
214 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtpTransportControllerAdapter); 216 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtpTransportControllerAdapter);
215 }; 217 };
216 218
217 } // namespace webrtc 219 } // namespace webrtc
218 220
219 #endif // WEBRTC_ORTC_RTPTRANSPORTCONTROLLERADAPTER_H_ 221 #endif // WEBRTC_ORTC_RTPTRANSPORTCONTROLLERADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698