OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 // use. However, since it needs to be included when constructing Channel, we | 94 // use. However, since it needs to be included when constructing Channel, we |
95 // cannot do that until we're able to move Channel ownership into the | 95 // cannot do that until we're able to move Channel ownership into the |
96 // Audio{Send,Receive}Streams. The best we can do is check that we're not | 96 // Audio{Send,Receive}Streams. The best we can do is check that we're not |
97 // trying to use two different factories using the different interfaces. | 97 // trying to use two different factories using the different interfaces. |
98 RTC_CHECK(config.decoder_factory); | 98 RTC_CHECK(config.decoder_factory); |
99 RTC_CHECK_EQ(config.decoder_factory, | 99 RTC_CHECK_EQ(config.decoder_factory, |
100 channel_proxy_->GetAudioDecoderFactory()); | 100 channel_proxy_->GetAudioDecoderFactory()); |
101 | 101 |
102 channel_proxy_->RegisterExternalTransport(config.rtcp_send_transport); | 102 channel_proxy_->RegisterExternalTransport(config.rtcp_send_transport); |
103 | 103 |
| 104 for (const auto& kv : config.decoder_map) { |
| 105 channel_proxy_->SetRecPayloadType(kv.first, kv.second); |
| 106 } |
| 107 |
104 for (const auto& extension : config.rtp.extensions) { | 108 for (const auto& extension : config.rtp.extensions) { |
105 if (extension.uri == RtpExtension::kAudioLevelUri) { | 109 if (extension.uri == RtpExtension::kAudioLevelUri) { |
106 channel_proxy_->SetReceiveAudioLevelIndicationStatus(true, extension.id); | 110 channel_proxy_->SetReceiveAudioLevelIndicationStatus(true, extension.id); |
107 bool registered = rtp_header_parser_->RegisterRtpHeaderExtension( | 111 bool registered = rtp_header_parser_->RegisterRtpHeaderExtension( |
108 kRtpExtensionAudioLevel, extension.id); | 112 kRtpExtensionAudioLevel, extension.id); |
109 RTC_DCHECK(registered); | 113 RTC_DCHECK(registered); |
110 } else if (extension.uri == RtpExtension::kTransportSequenceNumberUri) { | 114 } else if (extension.uri == RtpExtension::kTransportSequenceNumberUri) { |
111 channel_proxy_->EnableReceiveTransportSequenceNumber(extension.id); | 115 channel_proxy_->EnableReceiveTransportSequenceNumber(extension.id); |
112 bool registered = rtp_header_parser_->RegisterRtpHeaderExtension( | 116 bool registered = rtp_header_parser_->RegisterRtpHeaderExtension( |
113 kRtpExtensionTransportSequenceNumber, extension.id); | 117 kRtpExtensionTransportSequenceNumber, extension.id); |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 ScopedVoEInterface<VoEBase> base(voice_engine()); | 316 ScopedVoEInterface<VoEBase> base(voice_engine()); |
313 if (playout) { | 317 if (playout) { |
314 return base->StartPlayout(config_.voe_channel_id); | 318 return base->StartPlayout(config_.voe_channel_id); |
315 } else { | 319 } else { |
316 return base->StopPlayout(config_.voe_channel_id); | 320 return base->StopPlayout(config_.voe_channel_id); |
317 } | 321 } |
318 } | 322 } |
319 | 323 |
320 } // namespace internal | 324 } // namespace internal |
321 } // namespace webrtc | 325 } // namespace webrtc |
OLD | NEW |