Index: talk/media/webrtc/webrtcvoiceengine.cc |
diff --git a/talk/media/webrtc/webrtcvoiceengine.cc b/talk/media/webrtc/webrtcvoiceengine.cc |
index d1f76ef4b24f71ba9b9e53bf6bf0bd86d0ddd66a..2ec9d700f0ddb37b01586646230ca62adbf22257 100644 |
--- a/talk/media/webrtc/webrtcvoiceengine.cc |
+++ b/talk/media/webrtc/webrtcvoiceengine.cc |
@@ -511,18 +511,6 @@ void WebRtcVoiceEngine::Construct() { |
// Load our audio codec list. |
codecs_ = WebRtcVoiceCodecs::SupportedCodecs(); |
- // Load our RTP Header extensions. |
- rtp_header_extensions_.push_back( |
- RtpHeaderExtension(kRtpAudioLevelHeaderExtension, |
- kRtpAudioLevelHeaderExtensionDefaultId)); |
- rtp_header_extensions_.push_back( |
- RtpHeaderExtension(kRtpAbsoluteSenderTimeHeaderExtension, |
- kRtpAbsoluteSenderTimeHeaderExtensionDefaultId)); |
- if (webrtc::field_trial::FindFullName("WebRTC-SendSideBwe") == "Enabled") { |
- rtp_header_extensions_.push_back(RtpHeaderExtension( |
- kRtpTransportSequenceNumberHeaderExtension, |
- kRtpTransportSequenceNumberHeaderExtensionDefaultId)); |
- } |
options_ = GetDefaultEngineOptions(); |
} |
@@ -1074,10 +1062,21 @@ const std::vector<AudioCodec>& WebRtcVoiceEngine::codecs() { |
return codecs_; |
} |
-const std::vector<RtpHeaderExtension>& |
-WebRtcVoiceEngine::rtp_header_extensions() const { |
+RtpCapabilities |
+WebRtcVoiceEngine::GetCapabilities() const { |
RTC_DCHECK(signal_thread_checker_.CalledOnValidThread()); |
- return rtp_header_extensions_; |
+ RtpCapabilities capabilities; |
+ capabilities.header_extensions.push_back(RtpHeaderExtension( |
+ kRtpAudioLevelHeaderExtension, kRtpAudioLevelHeaderExtensionDefaultId)); |
+ capabilities.header_extensions.push_back( |
+ RtpHeaderExtension(kRtpAbsoluteSenderTimeHeaderExtension, |
+ kRtpAbsoluteSenderTimeHeaderExtensionDefaultId)); |
+ if (webrtc::field_trial::FindFullName("WebRTC-SendSideBwe") == "Enabled") { |
+ capabilities.header_extensions.push_back(RtpHeaderExtension( |
+ kRtpTransportSequenceNumberHeaderExtension, |
+ kRtpTransportSequenceNumberHeaderExtensionDefaultId)); |
+ } |
+ return capabilities; |
} |
int WebRtcVoiceEngine::GetLastEngineError() { |