| Index: webrtc/ortc/ortcfactory.cc
|
| diff --git a/webrtc/ortc/ortcfactory.cc b/webrtc/ortc/ortcfactory.cc
|
| index 1d968738cd7368af3b24f72b32c7be7bfe448658..e92fc1f6af0971eec5a604b145fdadea8b6edbec 100644
|
| --- a/webrtc/ortc/ortcfactory.cc
|
| +++ b/webrtc/ortc/ortcfactory.cc
|
| @@ -76,14 +76,14 @@ PROXY_METHOD0(RTCErrorOr<std::unique_ptr<RtpTransportControllerInterface>>,
|
| CreateRtpTransportController)
|
| PROXY_METHOD4(RTCErrorOr<std::unique_ptr<RtpTransportInterface>>,
|
| CreateRtpTransport,
|
| - const RtcpParameters&,
|
| + const RtpTransportParameters&,
|
| PacketTransportInterface*,
|
| PacketTransportInterface*,
|
| RtpTransportControllerInterface*)
|
|
|
| PROXY_METHOD4(RTCErrorOr<std::unique_ptr<SrtpTransportInterface>>,
|
| CreateSrtpTransport,
|
| - const RtcpParameters&,
|
| + const RtpTransportParameters&,
|
| PacketTransportInterface*,
|
| PacketTransportInterface*,
|
| RtpTransportControllerInterface*)
|
| @@ -218,22 +218,28 @@ OrtcFactory::~OrtcFactory() {
|
|
|
| RTCErrorOr<std::unique_ptr<RtpTransportControllerInterface>>
|
| OrtcFactory::CreateRtpTransportController() {
|
| + return CreateRtpTransportController(RtpTransportParameters());
|
| +}
|
| +
|
| +RTCErrorOr<std::unique_ptr<RtpTransportControllerInterface>>
|
| +OrtcFactory::CreateRtpTransportController(
|
| + const RtpTransportParameters& parameters) {
|
| RTC_DCHECK_RUN_ON(signaling_thread_);
|
| return RtpTransportControllerAdapter::CreateProxied(
|
| - cricket::MediaConfig(), channel_manager_.get(), null_event_log_.get(),
|
| - signaling_thread_, worker_thread_.get());
|
| + cricket::MediaConfig(), parameters, channel_manager_.get(),
|
| + null_event_log_.get(), signaling_thread_, worker_thread_.get());
|
| }
|
|
|
| RTCErrorOr<std::unique_ptr<RtpTransportInterface>>
|
| OrtcFactory::CreateRtpTransport(
|
| - const RtcpParameters& rtcp_parameters,
|
| + const RtpTransportParameters& parameters,
|
| PacketTransportInterface* rtp,
|
| PacketTransportInterface* rtcp,
|
| RtpTransportControllerInterface* transport_controller) {
|
| RTC_DCHECK_RUN_ON(signaling_thread_);
|
| - RtcpParameters copied_parameters = rtcp_parameters;
|
| - if (copied_parameters.cname.empty()) {
|
| - copied_parameters.cname = default_cname_;
|
| + RtpTransportParameters copied_parameters = parameters;
|
| + if (copied_parameters.rtcp.cname.empty()) {
|
| + copied_parameters.rtcp.cname = default_cname_;
|
| }
|
| if (transport_controller) {
|
| return transport_controller->GetInternal()->CreateProxiedRtpTransport(
|
| @@ -263,14 +269,14 @@ OrtcFactory::CreateRtpTransport(
|
|
|
| RTCErrorOr<std::unique_ptr<SrtpTransportInterface>>
|
| OrtcFactory::CreateSrtpTransport(
|
| - const RtcpParameters& rtcp_parameters,
|
| + const RtpTransportParameters& parameters,
|
| PacketTransportInterface* rtp,
|
| PacketTransportInterface* rtcp,
|
| RtpTransportControllerInterface* transport_controller) {
|
| RTC_DCHECK_RUN_ON(signaling_thread_);
|
| - RtcpParameters copied_parameters = rtcp_parameters;
|
| - if (copied_parameters.cname.empty()) {
|
| - copied_parameters.cname = default_cname_;
|
| + RtpTransportParameters copied_parameters = parameters;
|
| + if (copied_parameters.rtcp.cname.empty()) {
|
| + copied_parameters.rtcp.cname = default_cname_;
|
| }
|
| if (transport_controller) {
|
| return transport_controller->GetInternal()->CreateProxiedSrtpTransport(
|
|
|