diff options
| author | Karl Wiberg <kwiberg@webrtc.org> | 2018-03-20 19:18:55 +0100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2018-03-21 13:55:18 +0000 |
| commit | 08126349f5cc5d682a3398014a45088b4bb310f5 (patch) | |
| tree | 88ed1b772cd33ff32f32193169cd99be3db1ed58 /media/engine | |
| parent | 92be1caf4f6ab78d9e6a6f7e226e2f5a79bec2f4 (diff) | |
| download | webrtc-08126349f5cc5d682a3398014a45088b4bb310f5.tar.gz | |
Pass a real audio codec pair ID to decoders that we create
Bug: webrtc:8941
Change-Id: Ic2aed2ca759eb378164f3f65465e23fd7c13a9f8
Reviewed-on: https://webrtc-review.googlesource.com/63261
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22538}
Diffstat (limited to 'media/engine')
| -rw-r--r-- | media/engine/webrtcvoiceengine.cc | 5 | ||||
| -rw-r--r-- | media/engine/webrtcvoiceengine.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/media/engine/webrtcvoiceengine.cc b/media/engine/webrtcvoiceengine.cc index 3a530ab28f..809ea5408c 100644 --- a/media/engine/webrtcvoiceengine.cc +++ b/media/engine/webrtcvoiceengine.cc @@ -19,6 +19,7 @@ #include <utility> #include <vector> +#include "api/audio_codecs/audio_codec_pair_id.h" #include "api/call/audio_sink.h" #include "media/base/audiosource.h" #include "media/base/mediaconstants.h" @@ -1104,6 +1105,7 @@ class WebRtcVoiceMediaChannel::WebRtcAudioReceiveStream { webrtc::Transport* rtcp_send_transport, const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& decoder_factory, const std::map<int, webrtc::SdpAudioFormat>& decoder_map, + rtc::Optional<webrtc::AudioCodecPairId> codec_pair_id, size_t jitter_buffer_max_packets, bool jitter_buffer_fast_accelerate) : call_(call), config_() { @@ -1121,6 +1123,7 @@ class WebRtcVoiceMediaChannel::WebRtcAudioReceiveStream { } config_.decoder_factory = decoder_factory; config_.decoder_map = decoder_map; + config_.codec_pair_id = codec_pair_id; RecreateAudioReceiveStream(); } @@ -1850,7 +1853,7 @@ bool WebRtcVoiceMediaChannel::AddRecvStream(const StreamParams& sp) { ssrc, receiver_reports_ssrc_, recv_transport_cc_enabled_, recv_nack_enabled_, sp.stream_ids(), recv_rtp_extensions_, call_, this, engine()->decoder_factory_, decoder_map_, - engine()->audio_jitter_buffer_max_packets_, + codec_pair_id_, engine()->audio_jitter_buffer_max_packets_, engine()->audio_jitter_buffer_fast_accelerate_))); recv_streams_[ssrc]->SetPlayout(playout_); diff --git a/media/engine/webrtcvoiceengine.h b/media/engine/webrtcvoiceengine.h index fbf79533c4..950b72b5f5 100644 --- a/media/engine/webrtcvoiceengine.h +++ b/media/engine/webrtcvoiceengine.h @@ -272,6 +272,10 @@ class WebRtcVoiceMediaChannel final : public VoiceMediaChannel, rtc::Optional<webrtc::AudioSendStream::Config::SendCodecSpec> send_codec_spec_; + // TODO(kwiberg): Per-SSRC codec pair IDs? + const webrtc::AudioCodecPairId codec_pair_id_ = + webrtc::AudioCodecPairId::Create(); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel); }; } // namespace cricket |