Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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 RTCError SetRtcpParameters(const RtcpParameters& parameters, |
| 104 RtpTransportInterface* inner_transport); | 104 RtpTransportInterface* inner_transport); |
| 105 RTCError SetRtpTransportParameters(const RtpTransportParameters& parameters); | |
|
Taylor Brandstetter
2017/07/17 23:13:11
Do we need two methods here or just one?
ilnik
2017/07/21 12:21:19
I think one method is enough here. Removed SetRtcp
| |
| 105 | 106 |
| 106 cricket::VoiceChannel* voice_channel() { return voice_channel_; } | 107 cricket::VoiceChannel* voice_channel() { return voice_channel_; } |
| 107 cricket::VideoChannel* video_channel() { return video_channel_; } | 108 cricket::VideoChannel* video_channel() { return video_channel_; } |
| 108 | 109 |
| 109 // |primary_ssrc| out parameter is filled with either | 110 // |primary_ssrc| out parameter is filled with either |
| 110 // |parameters.encodings[0].ssrc|, or a generated SSRC if that's left unset. | 111 // |parameters.encodings[0].ssrc|, or a generated SSRC if that's left unset. |
| 111 RTCError ValidateAndApplyAudioSenderParameters( | 112 RTCError ValidateAndApplyAudioSenderParameters( |
| 112 const RtpParameters& parameters, | 113 const RtpParameters& parameters, |
| 113 uint32_t* primary_ssrc); | 114 uint32_t* primary_ssrc); |
| 114 RTCError ValidateAndApplyVideoSenderParameters( | 115 RTCError ValidateAndApplyVideoSenderParameters( |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 210 bool have_video_sender_ = false; | 211 bool have_video_sender_ = false; |
| 211 bool have_audio_receiver_ = false; | 212 bool have_audio_receiver_ = false; |
| 212 bool have_video_receiver_ = false; | 213 bool have_video_receiver_ = false; |
| 213 | 214 |
| 214 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtpTransportControllerAdapter); | 215 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtpTransportControllerAdapter); |
| 215 }; | 216 }; |
| 216 | 217 |
| 217 } // namespace webrtc | 218 } // namespace webrtc |
| 218 | 219 |
| 219 #endif // WEBRTC_ORTC_RTPTRANSPORTCONTROLLERADAPTER_H_ | 220 #endif // WEBRTC_ORTC_RTPTRANSPORTCONTROLLERADAPTER_H_ |
| OLD | NEW |