henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 | * |
| 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 |
| 6 | * tree. An additional intellectual property rights grant can be found |
| 7 | * in the file PATENTS. All contributing project authors may |
| 8 | * be found in the AUTHORS file in the root of the source tree. |
| 9 | */ |
| 10 | |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 11 | #include "modules/audio_coding/neteq/neteq_impl.h" |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 12 | |
| 13 | #include <assert.h> |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 14 | #include <algorithm> |
Yves Gerey | 988cc08 | 2018-10-23 12:03:01 +0200 | [diff] [blame] | 15 | #include <cstdint> |
| 16 | #include <cstring> |
| 17 | #include <list> |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 18 | #include <utility> |
ossu | 97ba30e | 2016-04-25 07:55:58 -0700 | [diff] [blame] | 19 | #include <vector> |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 20 | |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 21 | #include "api/audio_codecs/audio_decoder.h" |
| 22 | #include "common_audio/signal_processing/include/signal_processing_library.h" |
Yves Gerey | 988cc08 | 2018-10-23 12:03:01 +0200 | [diff] [blame] | 23 | #include "modules/audio_coding/codecs/cng/webrtc_cng.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 24 | #include "modules/audio_coding/neteq/accelerate.h" |
| 25 | #include "modules/audio_coding/neteq/background_noise.h" |
| 26 | #include "modules/audio_coding/neteq/buffer_level_filter.h" |
| 27 | #include "modules/audio_coding/neteq/comfort_noise.h" |
| 28 | #include "modules/audio_coding/neteq/decision_logic.h" |
| 29 | #include "modules/audio_coding/neteq/decoder_database.h" |
| 30 | #include "modules/audio_coding/neteq/defines.h" |
| 31 | #include "modules/audio_coding/neteq/delay_manager.h" |
| 32 | #include "modules/audio_coding/neteq/delay_peak_detector.h" |
| 33 | #include "modules/audio_coding/neteq/dtmf_buffer.h" |
| 34 | #include "modules/audio_coding/neteq/dtmf_tone_generator.h" |
| 35 | #include "modules/audio_coding/neteq/expand.h" |
| 36 | #include "modules/audio_coding/neteq/merge.h" |
| 37 | #include "modules/audio_coding/neteq/nack_tracker.h" |
| 38 | #include "modules/audio_coding/neteq/normal.h" |
| 39 | #include "modules/audio_coding/neteq/packet.h" |
| 40 | #include "modules/audio_coding/neteq/packet_buffer.h" |
| 41 | #include "modules/audio_coding/neteq/post_decode_vad.h" |
| 42 | #include "modules/audio_coding/neteq/preemptive_expand.h" |
| 43 | #include "modules/audio_coding/neteq/red_payload_splitter.h" |
| 44 | #include "modules/audio_coding/neteq/sync_buffer.h" |
| 45 | #include "modules/audio_coding/neteq/tick_timer.h" |
Yves Gerey | 988cc08 | 2018-10-23 12:03:01 +0200 | [diff] [blame] | 46 | #include "modules/audio_coding/neteq/time_stretch.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 47 | #include "modules/audio_coding/neteq/timestamp_scaler.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 48 | #include "rtc_base/checks.h" |
| 49 | #include "rtc_base/logging.h" |
Karl Wiberg | e40468b | 2017-11-22 10:42:26 +0100 | [diff] [blame] | 50 | #include "rtc_base/numerics/safe_conversions.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 51 | #include "rtc_base/sanitizer.h" |
Jonas Olsson | abbe841 | 2018-04-03 13:40:05 +0200 | [diff] [blame] | 52 | #include "rtc_base/strings/audio_format_to_string.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 53 | #include "rtc_base/trace_event.h" |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 54 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 55 | namespace webrtc { |
| 56 | |
ossu | e352578 | 2016-05-25 07:37:43 -0700 | [diff] [blame] | 57 | NetEqImpl::Dependencies::Dependencies( |
| 58 | const NetEq::Config& config, |
| 59 | const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory) |
henrik.lundin | 1d9061e | 2016-04-26 12:19:34 -0700 | [diff] [blame] | 60 | : tick_timer(new TickTimer), |
| 61 | buffer_level_filter(new BufferLevelFilter), |
Karl Wiberg | 0812634 | 2018-03-20 19:18:55 +0100 | [diff] [blame] | 62 | decoder_database( |
| 63 | new DecoderDatabase(decoder_factory, config.codec_pair_id)), |
Jakob Ivarsson | 39b934b | 2019-01-10 10:28:23 +0100 | [diff] [blame] | 64 | delay_peak_detector( |
| 65 | new DelayPeakDetector(tick_timer.get(), config.enable_rtx_handling)), |
henrik.lundin | 1d9061e | 2016-04-26 12:19:34 -0700 | [diff] [blame] | 66 | delay_manager(new DelayManager(config.max_packets_in_buffer, |
Jakob Ivarsson | 10403ae | 2018-11-27 15:45:20 +0100 | [diff] [blame] | 67 | config.min_delay_ms, |
Jakob Ivarsson | e98954c | 2019-02-06 15:37:50 +0100 | [diff] [blame] | 68 | config.enable_rtx_handling, |
henrik.lundin | 8f8c96d | 2016-04-28 23:19:20 -0700 | [diff] [blame] | 69 | delay_peak_detector.get(), |
| 70 | tick_timer.get())), |
henrik.lundin | 1d9061e | 2016-04-26 12:19:34 -0700 | [diff] [blame] | 71 | dtmf_buffer(new DtmfBuffer(config.sample_rate_hz)), |
| 72 | dtmf_tone_generator(new DtmfToneGenerator), |
| 73 | packet_buffer( |
| 74 | new PacketBuffer(config.max_packets_in_buffer, tick_timer.get())), |
ossu | a70695a | 2016-09-22 02:06:28 -0700 | [diff] [blame] | 75 | red_payload_splitter(new RedPayloadSplitter), |
henrik.lundin | 1d9061e | 2016-04-26 12:19:34 -0700 | [diff] [blame] | 76 | timestamp_scaler(new TimestampScaler(*decoder_database)), |
| 77 | accelerate_factory(new AccelerateFactory), |
| 78 | expand_factory(new ExpandFactory), |
| 79 | preemptive_expand_factory(new PreemptiveExpandFactory) {} |
| 80 | |
| 81 | NetEqImpl::Dependencies::~Dependencies() = default; |
| 82 | |
henrik.lundin@webrtc.org | ea25784 | 2014-08-07 12:27:37 +0000 | [diff] [blame] | 83 | NetEqImpl::NetEqImpl(const NetEq::Config& config, |
henrik.lundin | 1d9061e | 2016-04-26 12:19:34 -0700 | [diff] [blame] | 84 | Dependencies&& deps, |
turaj@webrtc.org | 8d1cdaa | 2014-04-11 18:47:55 +0000 | [diff] [blame] | 85 | bool create_components) |
henrik.lundin | 1d9061e | 2016-04-26 12:19:34 -0700 | [diff] [blame] | 86 | : tick_timer_(std::move(deps.tick_timer)), |
| 87 | buffer_level_filter_(std::move(deps.buffer_level_filter)), |
| 88 | decoder_database_(std::move(deps.decoder_database)), |
| 89 | delay_manager_(std::move(deps.delay_manager)), |
| 90 | delay_peak_detector_(std::move(deps.delay_peak_detector)), |
| 91 | dtmf_buffer_(std::move(deps.dtmf_buffer)), |
| 92 | dtmf_tone_generator_(std::move(deps.dtmf_tone_generator)), |
| 93 | packet_buffer_(std::move(deps.packet_buffer)), |
ossu | a70695a | 2016-09-22 02:06:28 -0700 | [diff] [blame] | 94 | red_payload_splitter_(std::move(deps.red_payload_splitter)), |
henrik.lundin | 1d9061e | 2016-04-26 12:19:34 -0700 | [diff] [blame] | 95 | timestamp_scaler_(std::move(deps.timestamp_scaler)), |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 96 | vad_(new PostDecodeVad()), |
henrik.lundin | 1d9061e | 2016-04-26 12:19:34 -0700 | [diff] [blame] | 97 | expand_factory_(std::move(deps.expand_factory)), |
| 98 | accelerate_factory_(std::move(deps.accelerate_factory)), |
| 99 | preemptive_expand_factory_(std::move(deps.preemptive_expand_factory)), |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 100 | last_mode_(kModeNormal), |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 101 | decoded_buffer_length_(kMaxFrameSize), |
| 102 | decoded_buffer_(new int16_t[decoded_buffer_length_]), |
| 103 | playout_timestamp_(0), |
| 104 | new_codec_(false), |
| 105 | timestamp_(0), |
| 106 | reset_decoder_(false), |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 107 | first_packet_(true), |
Henrik Lundin | cf808d2 | 2015-05-27 14:33:29 +0200 | [diff] [blame] | 108 | enable_fast_accelerate_(config.enable_fast_accelerate), |
henrik.lundin | 7a92681 | 2016-05-12 13:51:28 -0700 | [diff] [blame] | 109 | nack_enabled_(false), |
Henrik Lundin | 3ef3bfc | 2018-04-10 15:10:26 +0200 | [diff] [blame] | 110 | enable_muted_state_(config.enable_muted_state), |
| 111 | expand_uma_logger_("WebRTC.Audio.ExpandRatePercent", |
| 112 | 10, // Report once every 10 s. |
| 113 | tick_timer_.get()), |
| 114 | speech_expand_uma_logger_("WebRTC.Audio.SpeechExpandRatePercent", |
| 115 | 10, // Report once every 10 s. |
Henrik Lundin | 7687ad5 | 2018-07-02 10:14:46 +0200 | [diff] [blame] | 116 | tick_timer_.get()), |
Jakob Ivarsson | 39b934b | 2019-01-10 10:28:23 +0100 | [diff] [blame] | 117 | no_time_stretching_(config.for_test_no_time_stretching), |
| 118 | enable_rtx_handling_(config.enable_rtx_handling) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 119 | RTC_LOG(LS_INFO) << "NetEq config: " << config.ToString(); |
henrik.lundin@webrtc.org | ea25784 | 2014-08-07 12:27:37 +0000 | [diff] [blame] | 120 | int fs = config.sample_rate_hz; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 121 | if (fs != 8000 && fs != 16000 && fs != 32000 && fs != 48000) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 122 | RTC_LOG(LS_ERROR) << "Sample rate " << fs << " Hz not supported. " |
| 123 | << "Changing to 8000 Hz."; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 124 | fs = 8000; |
| 125 | } |
henrik.lundin | 1d9061e | 2016-04-26 12:19:34 -0700 | [diff] [blame] | 126 | delay_manager_->SetMaximumDelay(config.max_delay_ms); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 127 | fs_hz_ = fs; |
| 128 | fs_mult_ = fs / 8000; |
henrik.lundin | d89814b | 2015-11-23 06:49:25 -0800 | [diff] [blame] | 129 | last_output_sample_rate_hz_ = fs; |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 130 | output_size_samples_ = static_cast<size_t>(kOutputSizeMs * 8 * fs_mult_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 131 | decoder_frame_length_ = 3 * output_size_samples_; |
| 132 | WebRtcSpl_Init(); |
turaj@webrtc.org | 8d1cdaa | 2014-04-11 18:47:55 +0000 | [diff] [blame] | 133 | if (create_components) { |
| 134 | SetSampleRateAndChannels(fs, 1); // Default is 1 channel. |
| 135 | } |
henrik.lundin | 9bc2667 | 2015-11-02 03:25:57 -0800 | [diff] [blame] | 136 | RTC_DCHECK(!vad_->enabled()); |
| 137 | if (config.enable_post_decode_vad) { |
| 138 | vad_->Enable(); |
| 139 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 140 | } |
| 141 | |
Henrik Lundin | d67a219 | 2015-08-03 12:54:37 +0200 | [diff] [blame] | 142 | NetEqImpl::~NetEqImpl() = default; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 143 | |
Henrik Lundin | 70c09bd | 2017-04-24 15:56:56 +0200 | [diff] [blame] | 144 | int NetEqImpl::InsertPacket(const RTPHeader& rtp_header, |
kwiberg | ee2bac2 | 2015-11-11 10:34:00 -0800 | [diff] [blame] | 145 | rtc::ArrayView<const uint8_t> payload, |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 146 | uint32_t receive_timestamp) { |
kwiberg | ac554ee | 2016-09-02 00:39:33 -0700 | [diff] [blame] | 147 | rtc::MsanCheckInitialized(payload); |
henrik.lundin | a689b44 | 2015-12-17 03:50:05 -0800 | [diff] [blame] | 148 | TRACE_EVENT0("webrtc", "NetEqImpl::InsertPacket"); |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 149 | rtc::CritScope lock(&crit_sect_); |
Henrik Lundin | c417d9e | 2017-06-14 12:29:03 +0200 | [diff] [blame] | 150 | if (InsertPacketInternal(rtp_header, payload, receive_timestamp) != 0) { |
henrik.lundin@webrtc.org | e7ce437 | 2014-01-09 14:01:55 +0000 | [diff] [blame] | 151 | return kFail; |
| 152 | } |
| 153 | return kOK; |
turaj@webrtc.org | 7b75ac6 | 2013-09-26 00:27:56 +0000 | [diff] [blame] | 154 | } |
| 155 | |
henrik.lundin | b8c55b1 | 2017-05-10 07:38:01 -0700 | [diff] [blame] | 156 | void NetEqImpl::InsertEmptyPacket(const RTPHeader& /*rtp_header*/) { |
| 157 | // TODO(henrik.lundin) Handle NACK as well. This will make use of the |
| 158 | // rtp_header parameter. |
| 159 | // https://bugs.chromium.org/p/webrtc/issues/detail?id=7611 |
| 160 | rtc::CritScope lock(&crit_sect_); |
| 161 | delay_manager_->RegisterEmptyPacket(); |
| 162 | } |
| 163 | |
henrik.lundin | 500c04b | 2016-03-08 02:36:04 -0800 | [diff] [blame] | 164 | namespace { |
| 165 | void SetAudioFrameActivityAndType(bool vad_enabled, |
henrik.lundin | 55480f5 | 2016-03-08 02:37:57 -0800 | [diff] [blame] | 166 | NetEqImpl::OutputType type, |
henrik.lundin | 500c04b | 2016-03-08 02:36:04 -0800 | [diff] [blame] | 167 | AudioFrame::VADActivity last_vad_activity, |
| 168 | AudioFrame* audio_frame) { |
| 169 | switch (type) { |
henrik.lundin | 55480f5 | 2016-03-08 02:37:57 -0800 | [diff] [blame] | 170 | case NetEqImpl::OutputType::kNormalSpeech: { |
henrik.lundin | 500c04b | 2016-03-08 02:36:04 -0800 | [diff] [blame] | 171 | audio_frame->speech_type_ = AudioFrame::kNormalSpeech; |
| 172 | audio_frame->vad_activity_ = AudioFrame::kVadActive; |
| 173 | break; |
| 174 | } |
henrik.lundin | 55480f5 | 2016-03-08 02:37:57 -0800 | [diff] [blame] | 175 | case NetEqImpl::OutputType::kVadPassive: { |
henrik.lundin | 500c04b | 2016-03-08 02:36:04 -0800 | [diff] [blame] | 176 | // This should only be reached if the VAD is enabled. |
| 177 | RTC_DCHECK(vad_enabled); |
| 178 | audio_frame->speech_type_ = AudioFrame::kNormalSpeech; |
| 179 | audio_frame->vad_activity_ = AudioFrame::kVadPassive; |
| 180 | break; |
| 181 | } |
henrik.lundin | 55480f5 | 2016-03-08 02:37:57 -0800 | [diff] [blame] | 182 | case NetEqImpl::OutputType::kCNG: { |
henrik.lundin | 500c04b | 2016-03-08 02:36:04 -0800 | [diff] [blame] | 183 | audio_frame->speech_type_ = AudioFrame::kCNG; |
| 184 | audio_frame->vad_activity_ = AudioFrame::kVadPassive; |
| 185 | break; |
| 186 | } |
henrik.lundin | 55480f5 | 2016-03-08 02:37:57 -0800 | [diff] [blame] | 187 | case NetEqImpl::OutputType::kPLC: { |
henrik.lundin | 500c04b | 2016-03-08 02:36:04 -0800 | [diff] [blame] | 188 | audio_frame->speech_type_ = AudioFrame::kPLC; |
| 189 | audio_frame->vad_activity_ = last_vad_activity; |
| 190 | break; |
| 191 | } |
henrik.lundin | 55480f5 | 2016-03-08 02:37:57 -0800 | [diff] [blame] | 192 | case NetEqImpl::OutputType::kPLCCNG: { |
henrik.lundin | 500c04b | 2016-03-08 02:36:04 -0800 | [diff] [blame] | 193 | audio_frame->speech_type_ = AudioFrame::kPLCCNG; |
| 194 | audio_frame->vad_activity_ = AudioFrame::kVadPassive; |
| 195 | break; |
| 196 | } |
| 197 | default: |
| 198 | RTC_NOTREACHED(); |
| 199 | } |
| 200 | if (!vad_enabled) { |
| 201 | // Always set kVadUnknown when receive VAD is inactive. |
| 202 | audio_frame->vad_activity_ = AudioFrame::kVadUnknown; |
| 203 | } |
| 204 | } |
henrik.lundin | bc89de3 | 2016-03-08 05:20:14 -0800 | [diff] [blame] | 205 | } // namespace |
henrik.lundin | 500c04b | 2016-03-08 02:36:04 -0800 | [diff] [blame] | 206 | |
Ivo Creusen | 55de08e | 2018-09-03 11:49:27 +0200 | [diff] [blame] | 207 | int NetEqImpl::GetAudio(AudioFrame* audio_frame, |
| 208 | bool* muted, |
| 209 | absl::optional<Operations> action_override) { |
henrik.lundin | e1ca167 | 2016-01-08 03:50:08 -0800 | [diff] [blame] | 210 | TRACE_EVENT0("webrtc", "NetEqImpl::GetAudio"); |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 211 | rtc::CritScope lock(&crit_sect_); |
Ivo Creusen | 55de08e | 2018-09-03 11:49:27 +0200 | [diff] [blame] | 212 | if (GetAudioInternal(audio_frame, muted, action_override) != 0) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 213 | return kFail; |
| 214 | } |
henrik.lundin | 5fac3f0 | 2016-08-24 11:18:49 -0700 | [diff] [blame] | 215 | RTC_DCHECK_EQ( |
| 216 | audio_frame->sample_rate_hz_, |
kwiberg | d3edd77 | 2017-03-01 18:52:48 -0800 | [diff] [blame] | 217 | rtc::dchecked_cast<int>(audio_frame->samples_per_channel_ * 100)); |
henrik.lundin | a449107 | 2017-07-06 05:23:53 -0700 | [diff] [blame] | 218 | RTC_DCHECK_EQ(*muted, audio_frame->muted()); |
henrik.lundin | 500c04b | 2016-03-08 02:36:04 -0800 | [diff] [blame] | 219 | SetAudioFrameActivityAndType(vad_->enabled(), LastOutputType(), |
| 220 | last_vad_activity_, audio_frame); |
| 221 | last_vad_activity_ = audio_frame->vad_activity_; |
henrik.lundin | 6d8e011 | 2016-03-04 10:34:21 -0800 | [diff] [blame] | 222 | last_output_sample_rate_hz_ = audio_frame->sample_rate_hz_; |
henrik.lundin | d89814b | 2015-11-23 06:49:25 -0800 | [diff] [blame] | 223 | RTC_DCHECK(last_output_sample_rate_hz_ == 8000 || |
| 224 | last_output_sample_rate_hz_ == 16000 || |
| 225 | last_output_sample_rate_hz_ == 32000 || |
| 226 | last_output_sample_rate_hz_ == 48000) |
| 227 | << "Unexpected sample rate " << last_output_sample_rate_hz_; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 228 | return kOK; |
| 229 | } |
| 230 | |
kwiberg | 1c07c70 | 2017-03-27 07:15:49 -0700 | [diff] [blame] | 231 | void NetEqImpl::SetCodecs(const std::map<int, SdpAudioFormat>& codecs) { |
| 232 | rtc::CritScope lock(&crit_sect_); |
| 233 | const std::vector<int> changed_payload_types = |
| 234 | decoder_database_->SetCodecs(codecs); |
| 235 | for (const int pt : changed_payload_types) { |
minyue-webrtc | fae474c | 2017-07-05 11:17:40 +0200 | [diff] [blame] | 236 | packet_buffer_->DiscardPacketsWithPayloadType(pt, &stats_); |
kwiberg | 1c07c70 | 2017-03-27 07:15:49 -0700 | [diff] [blame] | 237 | } |
| 238 | } |
| 239 | |
kwiberg | 5adaf73 | 2016-10-04 09:33:27 -0700 | [diff] [blame] | 240 | bool NetEqImpl::RegisterPayloadType(int rtp_payload_type, |
| 241 | const SdpAudioFormat& audio_format) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 242 | RTC_LOG(LS_VERBOSE) << "NetEqImpl::RegisterPayloadType: payload type " |
Jonas Olsson | abbe841 | 2018-04-03 13:40:05 +0200 | [diff] [blame] | 243 | << rtp_payload_type << ", codec " |
| 244 | << rtc::ToString(audio_format); |
kwiberg | 5adaf73 | 2016-10-04 09:33:27 -0700 | [diff] [blame] | 245 | rtc::CritScope lock(&crit_sect_); |
Henrik Lundin | c417d9e | 2017-06-14 12:29:03 +0200 | [diff] [blame] | 246 | return decoder_database_->RegisterPayload(rtp_payload_type, audio_format) == |
| 247 | DecoderDatabase::kOK; |
kwiberg | 5adaf73 | 2016-10-04 09:33:27 -0700 | [diff] [blame] | 248 | } |
| 249 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 250 | int NetEqImpl::RemovePayloadType(uint8_t rtp_payload_type) { |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 251 | rtc::CritScope lock(&crit_sect_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 252 | int ret = decoder_database_->Remove(rtp_payload_type); |
Henrik Lundin | c417d9e | 2017-06-14 12:29:03 +0200 | [diff] [blame] | 253 | if (ret == DecoderDatabase::kOK || ret == DecoderDatabase::kDecoderNotFound) { |
minyue-webrtc | fae474c | 2017-07-05 11:17:40 +0200 | [diff] [blame] | 254 | packet_buffer_->DiscardPacketsWithPayloadType(rtp_payload_type, &stats_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 255 | return kOK; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 256 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 257 | return kFail; |
| 258 | } |
| 259 | |
kwiberg | 6b19b56 | 2016-09-20 04:02:25 -0700 | [diff] [blame] | 260 | void NetEqImpl::RemoveAllPayloadTypes() { |
| 261 | rtc::CritScope lock(&crit_sect_); |
| 262 | decoder_database_->RemoveAll(); |
| 263 | } |
| 264 | |
turaj@webrtc.org | f1efc57 | 2013-08-16 23:44:24 +0000 | [diff] [blame] | 265 | bool NetEqImpl::SetMinimumDelay(int delay_ms) { |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 266 | rtc::CritScope lock(&crit_sect_); |
Gustaf Ullberg | 48d96c0 | 2017-09-15 13:59:52 +0200 | [diff] [blame] | 267 | if (delay_ms >= 0 && delay_ms <= 10000) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 268 | assert(delay_manager_.get()); |
turaj@webrtc.org | f1efc57 | 2013-08-16 23:44:24 +0000 | [diff] [blame] | 269 | return delay_manager_->SetMinimumDelay(delay_ms); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 270 | } |
| 271 | return false; |
| 272 | } |
| 273 | |
turaj@webrtc.org | f1efc57 | 2013-08-16 23:44:24 +0000 | [diff] [blame] | 274 | bool NetEqImpl::SetMaximumDelay(int delay_ms) { |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 275 | rtc::CritScope lock(&crit_sect_); |
Gustaf Ullberg | 48d96c0 | 2017-09-15 13:59:52 +0200 | [diff] [blame] | 276 | if (delay_ms >= 0 && delay_ms <= 10000) { |
turaj@webrtc.org | f1efc57 | 2013-08-16 23:44:24 +0000 | [diff] [blame] | 277 | assert(delay_manager_.get()); |
| 278 | return delay_manager_->SetMaximumDelay(delay_ms); |
| 279 | } |
| 280 | return false; |
| 281 | } |
| 282 | |
Ruslan Burakov | 9bee67c | 2019-02-05 13:49:26 +0100 | [diff] [blame] | 283 | bool NetEqImpl::SetBaseMinimumDelayMs(int delay_ms) { |
| 284 | rtc::CritScope lock(&crit_sect_); |
| 285 | if (delay_ms >= 0 && delay_ms <= 10000) { |
| 286 | return delay_manager_->SetBaseMinimumDelay(delay_ms); |
| 287 | } |
| 288 | return false; |
| 289 | } |
| 290 | |
| 291 | int NetEqImpl::GetBaseMinimumDelayMs() const { |
| 292 | rtc::CritScope lock(&crit_sect_); |
| 293 | return delay_manager_->GetBaseMinimumDelay(); |
| 294 | } |
| 295 | |
Henrik Lundin | abbff89 | 2017-11-29 09:14:04 +0100 | [diff] [blame] | 296 | int NetEqImpl::TargetDelayMs() const { |
henrik.lundin | 114c1b3 | 2017-04-26 07:47:32 -0700 | [diff] [blame] | 297 | rtc::CritScope lock(&crit_sect_); |
| 298 | RTC_DCHECK(delay_manager_.get()); |
| 299 | // The value from TargetLevel() is in number of packets, represented in Q8. |
| 300 | const size_t target_delay_samples = |
| 301 | (delay_manager_->TargetLevel() * decoder_frame_length_) >> 8; |
| 302 | return static_cast<int>(target_delay_samples) / |
| 303 | rtc::CheckedDivExact(fs_hz_, 1000); |
Karl Wiberg | 7f6c4d4 | 2015-04-09 15:44:22 +0200 | [diff] [blame] | 304 | } |
| 305 | |
henrik.lundin | b3f1c5d | 2016-08-22 15:39:53 -0700 | [diff] [blame] | 306 | int NetEqImpl::FilteredCurrentDelayMs() const { |
| 307 | rtc::CritScope lock(&crit_sect_); |
| 308 | // Calculate the filtered packet buffer level in samples. The value from |
| 309 | // |buffer_level_filter_| is in number of packets, represented in Q8. |
| 310 | const size_t packet_buffer_samples = |
| 311 | (buffer_level_filter_->filtered_current_level() * |
| 312 | decoder_frame_length_) >> |
| 313 | 8; |
| 314 | // Sum up the filtered packet buffer level with the future length of the sync |
| 315 | // buffer, and divide the sum by the sample rate. |
| 316 | const size_t delay_samples = |
| 317 | packet_buffer_samples + sync_buffer_->FutureLength(); |
| 318 | // The division below will truncate. The return value is in ms. |
| 319 | return static_cast<int>(delay_samples) / rtc::CheckedDivExact(fs_hz_, 1000); |
| 320 | } |
| 321 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 322 | int NetEqImpl::NetworkStatistics(NetEqNetworkStatistics* stats) { |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 323 | rtc::CritScope lock(&crit_sect_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 324 | assert(decoder_database_.get()); |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 325 | const size_t total_samples_in_buffers = |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 326 | packet_buffer_->NumSamplesInBuffer(decoder_frame_length_) + |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 327 | sync_buffer_->FutureLength(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 328 | assert(delay_manager_.get()); |
| 329 | assert(decision_logic_.get()); |
Henrik Lundin | dccfc40 | 2017-09-25 12:30:58 +0200 | [diff] [blame] | 330 | const int ms_per_packet = rtc::dchecked_cast<int>( |
| 331 | decision_logic_->packet_length_samples() / (fs_hz_ / 1000)); |
| 332 | stats_.PopulateDelayManagerStats(ms_per_packet, *delay_manager_.get(), stats); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 333 | stats_.GetNetworkStatistics(fs_hz_, total_samples_in_buffers, |
Henrik Lundin | dccfc40 | 2017-09-25 12:30:58 +0200 | [diff] [blame] | 334 | decoder_frame_length_, stats); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 335 | return 0; |
| 336 | } |
| 337 | |
Steve Anton | 2dbc69f | 2017-08-24 17:15:13 -0700 | [diff] [blame] | 338 | NetEqLifetimeStatistics NetEqImpl::GetLifetimeStatistics() const { |
| 339 | rtc::CritScope lock(&crit_sect_); |
| 340 | return stats_.GetLifetimeStatistics(); |
| 341 | } |
| 342 | |
Ivo Creusen | d1c2f78 | 2018-09-13 14:39:55 +0200 | [diff] [blame] | 343 | NetEqOperationsAndState NetEqImpl::GetOperationsAndState() const { |
| 344 | rtc::CritScope lock(&crit_sect_); |
| 345 | auto result = stats_.GetOperationsAndState(); |
| 346 | result.current_buffer_size_ms = |
| 347 | (packet_buffer_->NumSamplesInBuffer(decoder_frame_length_) + |
| 348 | sync_buffer_->FutureLength()) * |
| 349 | 1000 / fs_hz_; |
Ivo Creusen | dc6d553 | 2018-09-27 11:43:42 +0200 | [diff] [blame] | 350 | result.current_frame_size_ms = decoder_frame_length_ * 1000 / fs_hz_; |
| 351 | result.next_packet_available = packet_buffer_->PeekNextPacket() && |
| 352 | packet_buffer_->PeekNextPacket()->timestamp == |
| 353 | sync_buffer_->end_timestamp(); |
Ivo Creusen | d1c2f78 | 2018-09-13 14:39:55 +0200 | [diff] [blame] | 354 | return result; |
| 355 | } |
| 356 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 357 | void NetEqImpl::EnableVad() { |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 358 | rtc::CritScope lock(&crit_sect_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 359 | assert(vad_.get()); |
| 360 | vad_->Enable(); |
| 361 | } |
| 362 | |
| 363 | void NetEqImpl::DisableVad() { |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 364 | rtc::CritScope lock(&crit_sect_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 365 | assert(vad_.get()); |
| 366 | vad_->Disable(); |
| 367 | } |
| 368 | |
Danil Chapovalov | b602123 | 2018-06-19 13:26:36 +0200 | [diff] [blame] | 369 | absl::optional<uint32_t> NetEqImpl::GetPlayoutTimestamp() const { |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 370 | rtc::CritScope lock(&crit_sect_); |
henrik.lundin | 0d96ab7 | 2016-04-06 12:28:26 -0700 | [diff] [blame] | 371 | if (first_packet_ || last_mode_ == kModeRfc3389Cng || |
| 372 | last_mode_ == kModeCodecInternalCng) { |
wu@webrtc.org | 94454b7 | 2014-06-05 20:34:08 +0000 | [diff] [blame] | 373 | // We don't have a valid RTP timestamp until we have decoded our first |
henrik.lundin | 0d96ab7 | 2016-04-06 12:28:26 -0700 | [diff] [blame] | 374 | // RTP packet. Also, the RTP timestamp is not accurate while playing CNG, |
| 375 | // which is indicated by returning an empty value. |
Danil Chapovalov | b602123 | 2018-06-19 13:26:36 +0200 | [diff] [blame] | 376 | return absl::nullopt; |
wu@webrtc.org | 94454b7 | 2014-06-05 20:34:08 +0000 | [diff] [blame] | 377 | } |
Oskar Sundbom | 12ab00b | 2017-11-16 15:31:38 +0100 | [diff] [blame] | 378 | return timestamp_scaler_->ToExternal(playout_timestamp_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 379 | } |
| 380 | |
henrik.lundin | d89814b | 2015-11-23 06:49:25 -0800 | [diff] [blame] | 381 | int NetEqImpl::last_output_sample_rate_hz() const { |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 382 | rtc::CritScope lock(&crit_sect_); |
henrik.lundin | d89814b | 2015-11-23 06:49:25 -0800 | [diff] [blame] | 383 | return last_output_sample_rate_hz_; |
| 384 | } |
| 385 | |
Danil Chapovalov | b602123 | 2018-06-19 13:26:36 +0200 | [diff] [blame] | 386 | absl::optional<SdpAudioFormat> NetEqImpl::GetDecoderFormat( |
ossu | f1b08da | 2016-09-23 02:19:43 -0700 | [diff] [blame] | 387 | int payload_type) const { |
kwiberg | c4ccd4d | 2016-09-21 10:55:15 -0700 | [diff] [blame] | 388 | rtc::CritScope lock(&crit_sect_); |
| 389 | const DecoderDatabase::DecoderInfo* const di = |
| 390 | decoder_database_->GetDecoderInfo(payload_type); |
| 391 | if (!di) { |
Danil Chapovalov | b602123 | 2018-06-19 13:26:36 +0200 | [diff] [blame] | 392 | return absl::nullopt; // Payload type not registered. |
kwiberg | c4ccd4d | 2016-09-21 10:55:15 -0700 | [diff] [blame] | 393 | } |
Fredrik Solenberg | f693bfa | 2018-12-11 12:22:10 +0100 | [diff] [blame] | 394 | |
| 395 | SdpAudioFormat format = di->GetFormat(); |
| 396 | // TODO(solenberg): This is legacy but messed up - mixing RTP rate and SR. |
| 397 | format.clockrate_hz = di->IsRed() ? 8000 : di->SampleRateHz(); |
| 398 | const AudioDecoder* const decoder = di->GetDecoder(); |
| 399 | format.num_channels = decoder ? decoder->Channels() : 1; |
| 400 | return format; |
kwiberg | c4ccd4d | 2016-09-21 10:55:15 -0700 | [diff] [blame] | 401 | } |
| 402 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 403 | void NetEqImpl::FlushBuffers() { |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 404 | rtc::CritScope lock(&crit_sect_); |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 405 | RTC_LOG(LS_VERBOSE) << "FlushBuffers"; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 406 | packet_buffer_->Flush(); |
henrik.lundin@webrtc.org | 0d5da25 | 2013-09-18 21:12:38 +0000 | [diff] [blame] | 407 | assert(sync_buffer_.get()); |
| 408 | assert(expand_.get()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 409 | sync_buffer_->Flush(); |
| 410 | sync_buffer_->set_next_index(sync_buffer_->next_index() - |
| 411 | expand_->overlap_length()); |
| 412 | // Set to wait for new codec. |
| 413 | first_packet_ = true; |
| 414 | } |
| 415 | |
henrik.lundin | 48ed930 | 2015-10-29 05:36:24 -0700 | [diff] [blame] | 416 | void NetEqImpl::EnableNack(size_t max_nack_list_size) { |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 417 | rtc::CritScope lock(&crit_sect_); |
henrik.lundin | 48ed930 | 2015-10-29 05:36:24 -0700 | [diff] [blame] | 418 | if (!nack_enabled_) { |
| 419 | const int kNackThresholdPackets = 2; |
henrik.lundin | 9195186 | 2016-06-08 06:43:41 -0700 | [diff] [blame] | 420 | nack_.reset(NackTracker::Create(kNackThresholdPackets)); |
henrik.lundin | 48ed930 | 2015-10-29 05:36:24 -0700 | [diff] [blame] | 421 | nack_enabled_ = true; |
| 422 | nack_->UpdateSampleRate(fs_hz_); |
| 423 | } |
| 424 | nack_->SetMaxNackListSize(max_nack_list_size); |
| 425 | } |
| 426 | |
| 427 | void NetEqImpl::DisableNack() { |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 428 | rtc::CritScope lock(&crit_sect_); |
henrik.lundin | 48ed930 | 2015-10-29 05:36:24 -0700 | [diff] [blame] | 429 | nack_.reset(); |
| 430 | nack_enabled_ = false; |
| 431 | } |
| 432 | |
| 433 | std::vector<uint16_t> NetEqImpl::GetNackList(int64_t round_trip_time_ms) const { |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 434 | rtc::CritScope lock(&crit_sect_); |
henrik.lundin | 48ed930 | 2015-10-29 05:36:24 -0700 | [diff] [blame] | 435 | if (!nack_enabled_) { |
| 436 | return std::vector<uint16_t>(); |
| 437 | } |
| 438 | RTC_DCHECK(nack_.get()); |
| 439 | return nack_->GetNackList(round_trip_time_ms); |
minyue@webrtc.org | d730177 | 2013-08-29 00:58:14 +0000 | [diff] [blame] | 440 | } |
| 441 | |
henrik.lundin | 114c1b3 | 2017-04-26 07:47:32 -0700 | [diff] [blame] | 442 | std::vector<uint32_t> NetEqImpl::LastDecodedTimestamps() const { |
| 443 | rtc::CritScope lock(&crit_sect_); |
| 444 | return last_decoded_timestamps_; |
| 445 | } |
| 446 | |
| 447 | int NetEqImpl::SyncBufferSizeMs() const { |
| 448 | rtc::CritScope lock(&crit_sect_); |
| 449 | return rtc::dchecked_cast<int>(sync_buffer_->FutureLength() / |
| 450 | rtc::CheckedDivExact(fs_hz_, 1000)); |
| 451 | } |
| 452 | |
henrik.lundin@webrtc.org | b287d96 | 2014-04-07 21:21:45 +0000 | [diff] [blame] | 453 | const SyncBuffer* NetEqImpl::sync_buffer_for_test() const { |
Tommi | 9090e0b | 2016-01-20 13:39:36 +0100 | [diff] [blame] | 454 | rtc::CritScope lock(&crit_sect_); |
henrik.lundin@webrtc.org | b287d96 | 2014-04-07 21:21:45 +0000 | [diff] [blame] | 455 | return sync_buffer_.get(); |
| 456 | } |
| 457 | |
minyue | 5bd3397 | 2016-05-02 04:46:11 -0700 | [diff] [blame] | 458 | Operations NetEqImpl::last_operation_for_test() const { |
| 459 | rtc::CritScope lock(&crit_sect_); |
| 460 | return last_operation_; |
| 461 | } |
| 462 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 463 | // Methods below this line are private. |
| 464 | |
Henrik Lundin | 70c09bd | 2017-04-24 15:56:56 +0200 | [diff] [blame] | 465 | int NetEqImpl::InsertPacketInternal(const RTPHeader& rtp_header, |
kwiberg | ee2bac2 | 2015-11-11 10:34:00 -0800 | [diff] [blame] | 466 | rtc::ArrayView<const uint8_t> payload, |
ossu | 17e3fa1 | 2016-09-08 04:52:55 -0700 | [diff] [blame] | 467 | uint32_t receive_timestamp) { |
kwiberg | ee2bac2 | 2015-11-11 10:34:00 -0800 | [diff] [blame] | 468 | if (payload.empty()) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 469 | RTC_LOG_F(LS_ERROR) << "payload is empty"; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 470 | return kInvalidPointer; |
| 471 | } |
ossu | 17e3fa1 | 2016-09-08 04:52:55 -0700 | [diff] [blame] | 472 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 473 | PacketList packet_list; |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 474 | // Insert packet in a packet list. |
| 475 | packet_list.push_back([&rtp_header, &payload] { |
henrik.lundin@webrtc.org | e1d468c | 2013-01-30 07:37:20 +0000 | [diff] [blame] | 476 | // Convert to Packet. |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 477 | Packet packet; |
Henrik Lundin | 70c09bd | 2017-04-24 15:56:56 +0200 | [diff] [blame] | 478 | packet.payload_type = rtp_header.payloadType; |
| 479 | packet.sequence_number = rtp_header.sequenceNumber; |
| 480 | packet.timestamp = rtp_header.timestamp; |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 481 | packet.payload.SetData(payload.data(), payload.size()); |
henrik.lundin | 84f8cd6 | 2016-04-26 07:45:16 -0700 | [diff] [blame] | 482 | // Waiting time will be set upon inserting the packet in the buffer. |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 483 | RTC_DCHECK(!packet.waiting_time); |
| 484 | return packet; |
| 485 | }()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 486 | |
Niels Möller | bb9f4c1 | 2018-11-21 16:07:10 +0100 | [diff] [blame] | 487 | bool update_sample_rate_and_channels = first_packet_; |
dkirovbroadsoft | e851a9a | 2017-03-14 10:00:27 -0700 | [diff] [blame] | 488 | |
| 489 | if (update_sample_rate_and_channels) { |
| 490 | // Reset timestamp scaling. |
| 491 | timestamp_scaler_->Reset(); |
| 492 | } |
| 493 | |
Henrik Lundin | 70c09bd | 2017-04-24 15:56:56 +0200 | [diff] [blame] | 494 | if (!decoder_database_->IsRed(rtp_header.payloadType)) { |
dkirovbroadsoft | e851a9a | 2017-03-14 10:00:27 -0700 | [diff] [blame] | 495 | // Scale timestamp to internal domain (only for some codecs). |
| 496 | timestamp_scaler_->ToInternal(&packet_list); |
| 497 | } |
| 498 | |
| 499 | // Store these for later use, since the first packet may very well disappear |
| 500 | // before we need these values. |
| 501 | uint32_t main_timestamp = packet_list.front().timestamp; |
| 502 | uint8_t main_payload_type = packet_list.front().payload_type; |
| 503 | uint16_t main_sequence_number = packet_list.front().sequence_number; |
| 504 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 505 | // Reinitialize NetEq if it's needed (changed SSRC or first call). |
dkirovbroadsoft | e851a9a | 2017-03-14 10:00:27 -0700 | [diff] [blame] | 506 | if (update_sample_rate_and_channels) { |
henrik.lundin@webrtc.org | 6ff3ac1 | 2014-11-20 14:14:49 +0000 | [diff] [blame] | 507 | // Note: |first_packet_| will be cleared further down in this method, once |
| 508 | // the packet has been successfully inserted into the packet buffer. |
| 509 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 510 | // Flush the packet buffer and DTMF buffer. |
| 511 | packet_buffer_->Flush(); |
| 512 | dtmf_buffer_->Flush(); |
| 513 | |
turaj@webrtc.org | 4d06db5 | 2013-03-27 18:31:42 +0000 | [diff] [blame] | 514 | // Update audio buffer timestamp. |
dkirovbroadsoft | e851a9a | 2017-03-14 10:00:27 -0700 | [diff] [blame] | 515 | sync_buffer_->IncreaseEndTimestamp(main_timestamp - timestamp_); |
turaj@webrtc.org | 4d06db5 | 2013-03-27 18:31:42 +0000 | [diff] [blame] | 516 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 517 | // Update codecs. |
dkirovbroadsoft | e851a9a | 2017-03-14 10:00:27 -0700 | [diff] [blame] | 518 | timestamp_ = main_timestamp; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 519 | } |
| 520 | |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 521 | if (nack_enabled_) { |
| 522 | RTC_DCHECK(nack_); |
| 523 | if (update_sample_rate_and_channels) { |
| 524 | nack_->Reset(); |
| 525 | } |
Henrik Lundin | 70c09bd | 2017-04-24 15:56:56 +0200 | [diff] [blame] | 526 | nack_->UpdateLastReceivedPacket(rtp_header.sequenceNumber, |
| 527 | rtp_header.timestamp); |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 528 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 529 | |
| 530 | // Check for RED payload type, and separate payloads into several packets. |
Henrik Lundin | 70c09bd | 2017-04-24 15:56:56 +0200 | [diff] [blame] | 531 | if (decoder_database_->IsRed(rtp_header.payloadType)) { |
ossu | a70695a | 2016-09-22 02:06:28 -0700 | [diff] [blame] | 532 | if (!red_payload_splitter_->SplitRed(&packet_list)) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 533 | return kRedundancySplitError; |
| 534 | } |
| 535 | // Only accept a few RED payloads of the same type as the main data, |
| 536 | // DTMF events and CNG. |
ossu | a70695a | 2016-09-22 02:06:28 -0700 | [diff] [blame] | 537 | red_payload_splitter_->CheckRedPayloads(&packet_list, *decoder_database_); |
Henrik Lundin | defa7a8 | 2018-07-03 13:07:30 +0200 | [diff] [blame] | 538 | if (packet_list.empty()) { |
| 539 | return kRedundancySplitError; |
| 540 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 541 | } |
| 542 | |
| 543 | // Check payload types. |
| 544 | if (decoder_database_->CheckPayloadTypes(packet_list) == |
| 545 | DecoderDatabase::kDecoderNotFound) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 546 | return kUnknownRtpPayloadType; |
| 547 | } |
| 548 | |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 549 | RTC_DCHECK(!packet_list.empty()); |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 550 | |
dkirovbroadsoft | e851a9a | 2017-03-14 10:00:27 -0700 | [diff] [blame] | 551 | // Update main_timestamp, if new packets appear in the list |
| 552 | // after RED splitting. |
Henrik Lundin | 70c09bd | 2017-04-24 15:56:56 +0200 | [diff] [blame] | 553 | if (decoder_database_->IsRed(rtp_header.payloadType)) { |
dkirovbroadsoft | e851a9a | 2017-03-14 10:00:27 -0700 | [diff] [blame] | 554 | timestamp_scaler_->ToInternal(&packet_list); |
| 555 | main_timestamp = packet_list.front().timestamp; |
| 556 | main_payload_type = packet_list.front().payload_type; |
| 557 | main_sequence_number = packet_list.front().sequence_number; |
| 558 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 559 | |
| 560 | // Process DTMF payloads. Cycle through the list of packets, and pick out any |
| 561 | // DTMF payloads found. |
| 562 | PacketList::iterator it = packet_list.begin(); |
| 563 | while (it != packet_list.end()) { |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 564 | const Packet& current_packet = (*it); |
| 565 | RTC_DCHECK(!current_packet.payload.empty()); |
| 566 | if (decoder_database_->IsDtmf(current_packet.payload_type)) { |
minyue@webrtc.org | 9721db7 | 2013-08-06 05:36:26 +0000 | [diff] [blame] | 567 | DtmfEvent event; |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 568 | int ret = DtmfBuffer::ParseEvent(current_packet.timestamp, |
| 569 | current_packet.payload.data(), |
| 570 | current_packet.payload.size(), &event); |
minyue@webrtc.org | 9721db7 | 2013-08-06 05:36:26 +0000 | [diff] [blame] | 571 | if (ret != DtmfBuffer::kOK) { |
minyue@webrtc.org | 9721db7 | 2013-08-06 05:36:26 +0000 | [diff] [blame] | 572 | return kDtmfParsingError; |
| 573 | } |
| 574 | if (dtmf_buffer_->InsertEvent(event) != DtmfBuffer::kOK) { |
minyue@webrtc.org | 9721db7 | 2013-08-06 05:36:26 +0000 | [diff] [blame] | 575 | return kDtmfInsertError; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 576 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 577 | it = packet_list.erase(it); |
| 578 | } else { |
| 579 | ++it; |
| 580 | } |
| 581 | } |
| 582 | |
ossu | 17e3fa1 | 2016-09-08 04:52:55 -0700 | [diff] [blame] | 583 | // Update bandwidth estimate, if the packet is not comfort noise. |
| 584 | if (!packet_list.empty() && |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 585 | !decoder_database_->IsComfortNoise(main_payload_type)) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 586 | // The list can be empty here if we got nothing but DTMF payloads. |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 587 | AudioDecoder* decoder = decoder_database_->GetDecoder(main_payload_type); |
| 588 | RTC_DCHECK(decoder); // Should always get a valid object, since we have |
| 589 | // already checked that the payload types are known. |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 590 | decoder->IncomingPacket(packet_list.front().payload.data(), |
| 591 | packet_list.front().payload.size(), |
| 592 | packet_list.front().sequence_number, |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 593 | packet_list.front().timestamp, receive_timestamp); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 594 | } |
| 595 | |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 596 | PacketList parsed_packet_list; |
| 597 | while (!packet_list.empty()) { |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 598 | Packet& packet = packet_list.front(); |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 599 | const DecoderDatabase::DecoderInfo* info = |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 600 | decoder_database_->GetDecoderInfo(packet.payload_type); |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 601 | if (!info) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 602 | RTC_LOG(LS_WARNING) << "SplitAudio unknown payload type"; |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 603 | return kUnknownRtpPayloadType; |
| 604 | } |
| 605 | |
| 606 | if (info->IsComfortNoise()) { |
| 607 | // Carry comfort noise packets along. |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 608 | parsed_packet_list.splice(parsed_packet_list.end(), packet_list, |
| 609 | packet_list.begin()); |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 610 | } else { |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 611 | const auto sequence_number = packet.sequence_number; |
| 612 | const auto payload_type = packet.payload_type; |
| 613 | const Packet::Priority original_priority = packet.priority; |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 614 | auto packet_from_result = [&](AudioDecoder::ParseResult& result) { |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 615 | Packet new_packet; |
| 616 | new_packet.sequence_number = sequence_number; |
| 617 | new_packet.payload_type = payload_type; |
| 618 | new_packet.timestamp = result.timestamp; |
| 619 | new_packet.priority.codec_level = result.priority; |
| 620 | new_packet.priority.red_level = original_priority.red_level; |
| 621 | new_packet.frame = std::move(result.frame); |
| 622 | return new_packet; |
| 623 | }; |
| 624 | |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 625 | std::vector<AudioDecoder::ParseResult> results = |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 626 | info->GetDecoder()->ParsePayload(std::move(packet.payload), |
| 627 | packet.timestamp); |
| 628 | if (results.empty()) { |
| 629 | packet_list.pop_front(); |
| 630 | } else { |
| 631 | bool first = true; |
| 632 | for (auto& result : results) { |
| 633 | RTC_DCHECK(result.frame); |
| 634 | RTC_DCHECK_GE(result.priority, 0); |
| 635 | if (first) { |
| 636 | // Re-use the node and move it to parsed_packet_list. |
| 637 | packet_list.front() = packet_from_result(result); |
| 638 | parsed_packet_list.splice(parsed_packet_list.end(), packet_list, |
| 639 | packet_list.begin()); |
| 640 | first = false; |
| 641 | } else { |
| 642 | parsed_packet_list.push_back(packet_from_result(result)); |
| 643 | } |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 644 | } |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 645 | } |
| 646 | } |
| 647 | } |
| 648 | |
Ivo Creusen | fd7c0a5 | 2017-10-20 12:35:04 +0200 | [diff] [blame] | 649 | // Calculate the number of primary (non-FEC/RED) packets. |
| 650 | const int number_of_primary_packets = std::count_if( |
| 651 | parsed_packet_list.begin(), parsed_packet_list.end(), |
| 652 | [](const Packet& in) { return in.priority.codec_level == 0; }); |
| 653 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 654 | // Insert packets in buffer. |
ossu | a70695a | 2016-09-22 02:06:28 -0700 | [diff] [blame] | 655 | const int ret = packet_buffer_->InsertPacketList( |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 656 | &parsed_packet_list, *decoder_database_, ¤t_rtp_payload_type_, |
minyue-webrtc | 12d3084 | 2017-07-19 11:44:06 +0200 | [diff] [blame] | 657 | ¤t_cng_rtp_payload_type_, &stats_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 658 | if (ret == PacketBuffer::kFlushed) { |
| 659 | // Reset DSP timestamp etc. if packet buffer flushed. |
| 660 | new_codec_ = true; |
turaj@webrtc.org | a6101d7 | 2013-10-01 22:01:09 +0000 | [diff] [blame] | 661 | update_sample_rate_and_channels = true; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 662 | } else if (ret != PacketBuffer::kOK) { |
minyue@webrtc.org | 7bb5436 | 2013-08-06 05:40:57 +0000 | [diff] [blame] | 663 | return kOtherError; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 664 | } |
henrik.lundin@webrtc.org | 6ff3ac1 | 2014-11-20 14:14:49 +0000 | [diff] [blame] | 665 | |
| 666 | if (first_packet_) { |
| 667 | first_packet_ = false; |
| 668 | // Update the codec on the next GetAudio call. |
| 669 | new_codec_ = true; |
| 670 | } |
| 671 | |
henrik.lundin | da8bbf6 | 2016-08-31 03:14:11 -0700 | [diff] [blame] | 672 | if (current_rtp_payload_type_) { |
| 673 | RTC_DCHECK(decoder_database_->GetDecoderInfo(*current_rtp_payload_type_)) |
| 674 | << "Payload type " << static_cast<int>(*current_rtp_payload_type_) |
| 675 | << " is unknown where it shouldn't be"; |
| 676 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 677 | |
turaj@webrtc.org | a6101d7 | 2013-10-01 22:01:09 +0000 | [diff] [blame] | 678 | if (update_sample_rate_and_channels && !packet_buffer_->Empty()) { |
| 679 | // We do not use |current_rtp_payload_type_| to |set payload_type|, but |
| 680 | // get the next RTP header from |packet_buffer_| to obtain the payload type. |
| 681 | // The reason for it is the following corner case. If NetEq receives a |
| 682 | // CNG packet with a sample rate different than the current CNG then it |
| 683 | // flushes its buffer, assuming send codec must have been changed. However, |
| 684 | // payload type of the hypothetically new send codec is not known. |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 685 | const Packet* next_packet = packet_buffer_->PeekNextPacket(); |
| 686 | RTC_DCHECK(next_packet); |
| 687 | const int payload_type = next_packet->payload_type; |
ossu | 97ba30e | 2016-04-25 07:55:58 -0700 | [diff] [blame] | 688 | size_t channels = 1; |
| 689 | if (!decoder_database_->IsComfortNoise(payload_type)) { |
| 690 | AudioDecoder* decoder = decoder_database_->GetDecoder(payload_type); |
| 691 | assert(decoder); // Payloads are already checked to be valid. |
| 692 | channels = decoder->Channels(); |
| 693 | } |
turaj@webrtc.org | a6101d7 | 2013-10-01 22:01:09 +0000 | [diff] [blame] | 694 | const DecoderDatabase::DecoderInfo* decoder_info = |
| 695 | decoder_database_->GetDecoderInfo(payload_type); |
| 696 | assert(decoder_info); |
kwiberg | c0f2dcf | 2016-05-31 06:28:03 -0700 | [diff] [blame] | 697 | if (decoder_info->SampleRateHz() != fs_hz_ || |
ossu | 97ba30e | 2016-04-25 07:55:58 -0700 | [diff] [blame] | 698 | channels != algorithm_buffer_->Channels()) { |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 699 | SetSampleRateAndChannels(decoder_info->SampleRateHz(), channels); |
henrik.lundin | 48ed930 | 2015-10-29 05:36:24 -0700 | [diff] [blame] | 700 | } |
| 701 | if (nack_enabled_) { |
| 702 | RTC_DCHECK(nack_); |
| 703 | // Update the sample rate even if the rate is not new, because of Reset(). |
| 704 | nack_->UpdateSampleRate(fs_hz_); |
| 705 | } |
turaj@webrtc.org | a6101d7 | 2013-10-01 22:01:09 +0000 | [diff] [blame] | 706 | } |
| 707 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 708 | // TODO(hlundin): Move this code to DelayManager class. |
| 709 | const DecoderDatabase::DecoderInfo* dec_info = |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 710 | decoder_database_->GetDecoderInfo(main_payload_type); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 711 | assert(dec_info); // Already checked that the payload type is known. |
ossu | f1b08da | 2016-09-23 02:19:43 -0700 | [diff] [blame] | 712 | delay_manager_->LastDecodedWasCngOrDtmf(dec_info->IsComfortNoise() || |
| 713 | dec_info->IsDtmf()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 714 | if (delay_manager_->last_pack_cng_or_dtmf() == 0) { |
| 715 | // Calculate the total speech length carried in each packet. |
Ivo Creusen | fd7c0a5 | 2017-10-20 12:35:04 +0200 | [diff] [blame] | 716 | if (number_of_primary_packets > 0) { |
henrik.lundin | 116c84e | 2015-08-27 13:14:48 -0700 | [diff] [blame] | 717 | const size_t packet_length_samples = |
Ivo Creusen | fd7c0a5 | 2017-10-20 12:35:04 +0200 | [diff] [blame] | 718 | number_of_primary_packets * decoder_frame_length_; |
henrik.lundin | 116c84e | 2015-08-27 13:14:48 -0700 | [diff] [blame] | 719 | if (packet_length_samples != decision_logic_->packet_length_samples()) { |
| 720 | decision_logic_->set_packet_length_samples(packet_length_samples); |
| 721 | delay_manager_->SetPacketAudioLength( |
kwiberg | d3edd77 | 2017-03-01 18:52:48 -0800 | [diff] [blame] | 722 | rtc::dchecked_cast<int>((1000 * packet_length_samples) / fs_hz_)); |
henrik.lundin | 116c84e | 2015-08-27 13:14:48 -0700 | [diff] [blame] | 723 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 724 | } |
| 725 | |
| 726 | // Update statistics. |
Jakob Ivarsson | 39b934b | 2019-01-10 10:28:23 +0100 | [diff] [blame] | 727 | if ((enable_rtx_handling_ || (int32_t)(main_timestamp - timestamp_) >= 0) && |
| 728 | !new_codec_) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 729 | // Only update statistics if incoming packet is not older than last played |
Jakob Ivarsson | 39b934b | 2019-01-10 10:28:23 +0100 | [diff] [blame] | 730 | // out packet or RTX handling is enabled, and if new codec flag is not |
| 731 | // set. |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 732 | delay_manager_->Update(main_sequence_number, main_timestamp, fs_hz_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 733 | } |
| 734 | } else if (delay_manager_->last_pack_cng_or_dtmf() == -1) { |
| 735 | // This is first "normal" packet after CNG or DTMF. |
| 736 | // Reset packet time counter and measure time until next packet, |
| 737 | // but don't update statistics. |
| 738 | delay_manager_->set_last_pack_cng_or_dtmf(0); |
| 739 | delay_manager_->ResetPacketIatCount(); |
| 740 | } |
| 741 | return 0; |
| 742 | } |
| 743 | |
Ivo Creusen | 55de08e | 2018-09-03 11:49:27 +0200 | [diff] [blame] | 744 | int NetEqImpl::GetAudioInternal(AudioFrame* audio_frame, |
| 745 | bool* muted, |
| 746 | absl::optional<Operations> action_override) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 747 | PacketList packet_list; |
| 748 | DtmfEvent dtmf_event; |
| 749 | Operations operation; |
| 750 | bool play_dtmf; |
henrik.lundin | 7a92681 | 2016-05-12 13:51:28 -0700 | [diff] [blame] | 751 | *muted = false; |
henrik.lundin | 114c1b3 | 2017-04-26 07:47:32 -0700 | [diff] [blame] | 752 | last_decoded_timestamps_.clear(); |
henrik.lundin | ed49721 | 2016-04-25 10:11:38 -0700 | [diff] [blame] | 753 | tick_timer_->Increment(); |
henrik.lundin | 60f6ce2 | 2016-05-10 03:52:04 -0700 | [diff] [blame] | 754 | stats_.IncreaseCounter(output_size_samples_, fs_hz_); |
Henrik Lundin | 3ef3bfc | 2018-04-10 15:10:26 +0200 | [diff] [blame] | 755 | const auto lifetime_stats = stats_.GetLifetimeStatistics(); |
| 756 | expand_uma_logger_.UpdateSampleCounter(lifetime_stats.concealed_samples, |
| 757 | fs_hz_); |
| 758 | speech_expand_uma_logger_.UpdateSampleCounter( |
| 759 | lifetime_stats.voice_concealed_samples, fs_hz_); |
henrik.lundin | 7a92681 | 2016-05-12 13:51:28 -0700 | [diff] [blame] | 760 | |
| 761 | // Check for muted state. |
| 762 | if (enable_muted_state_ && expand_->Muted() && packet_buffer_->Empty()) { |
| 763 | RTC_DCHECK_EQ(last_mode_, kModeExpand); |
henrik.lundin | a449107 | 2017-07-06 05:23:53 -0700 | [diff] [blame] | 764 | audio_frame->Reset(); |
| 765 | RTC_DCHECK(audio_frame->muted()); // Reset() should mute the frame. |
henrik.lundin | 7a92681 | 2016-05-12 13:51:28 -0700 | [diff] [blame] | 766 | playout_timestamp_ += static_cast<uint32_t>(output_size_samples_); |
| 767 | audio_frame->sample_rate_hz_ = fs_hz_; |
| 768 | audio_frame->samples_per_channel_ = output_size_samples_; |
| 769 | audio_frame->timestamp_ = |
| 770 | first_packet_ |
| 771 | ? 0 |
| 772 | : timestamp_scaler_->ToExternal(playout_timestamp_) - |
| 773 | static_cast<uint32_t>(audio_frame->samples_per_channel_); |
| 774 | audio_frame->num_channels_ = sync_buffer_->Channels(); |
Gustaf Ullberg | 9a2e906 | 2017-09-18 09:28:20 +0200 | [diff] [blame] | 775 | stats_.ExpandedNoiseSamples(output_size_samples_, false); |
henrik.lundin | 7a92681 | 2016-05-12 13:51:28 -0700 | [diff] [blame] | 776 | *muted = true; |
| 777 | return 0; |
| 778 | } |
Ivo Creusen | 55de08e | 2018-09-03 11:49:27 +0200 | [diff] [blame] | 779 | int return_value = GetDecision(&operation, &packet_list, &dtmf_event, |
| 780 | &play_dtmf, action_override); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 781 | if (return_value != 0) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 782 | last_mode_ = kModeError; |
| 783 | return return_value; |
| 784 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 785 | |
| 786 | AudioDecoder::SpeechType speech_type; |
| 787 | int length = 0; |
Henrik Lundin | 1803628 | 2017-11-02 12:09:06 +0100 | [diff] [blame] | 788 | const size_t start_num_packets = packet_list.size(); |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 789 | int decode_return_value = |
| 790 | Decode(&packet_list, &operation, &length, &speech_type); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 791 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 792 | assert(vad_.get()); |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 793 | bool sid_frame_available = (operation == kRfc3389Cng && !packet_list.empty()); |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 794 | vad_->Update(decoded_buffer_.get(), static_cast<size_t>(length), speech_type, |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 795 | sid_frame_available, fs_hz_); |
| 796 | |
Henrik Lundin | 1803628 | 2017-11-02 12:09:06 +0100 | [diff] [blame] | 797 | // This is the criterion that we did decode some data through the speech |
| 798 | // decoder, and the operation resulted in comfort noise. |
| 799 | const bool codec_internal_sid_frame = |
Henrik Lundin | 4f2a4a1 | 2018-01-26 17:32:56 +0100 | [diff] [blame] | 800 | (speech_type == AudioDecoder::kComfortNoise && |
| 801 | start_num_packets > packet_list.size()); |
Henrik Lundin | 1803628 | 2017-11-02 12:09:06 +0100 | [diff] [blame] | 802 | |
| 803 | if (sid_frame_available || codec_internal_sid_frame) { |
henrik.lundin | b1fb72b | 2016-05-03 08:18:47 -0700 | [diff] [blame] | 804 | // Start a new stopwatch since we are decoding a new CNG packet. |
| 805 | generated_noise_stopwatch_ = tick_timer_->GetNewStopwatch(); |
| 806 | } |
| 807 | |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 808 | algorithm_buffer_->Clear(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 809 | switch (operation) { |
| 810 | case kNormal: { |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 811 | DoNormal(decoded_buffer_.get(), length, speech_type, play_dtmf); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 812 | break; |
| 813 | } |
| 814 | case kMerge: { |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 815 | DoMerge(decoded_buffer_.get(), length, speech_type, play_dtmf); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 816 | break; |
| 817 | } |
| 818 | case kExpand: { |
Henrik Lundin | 00eb12a | 2018-09-05 18:14:52 +0200 | [diff] [blame] | 819 | RTC_DCHECK_EQ(return_value, 0); |
| 820 | if (!current_rtp_payload_type_ || !DoCodecPlc()) { |
| 821 | return_value = DoExpand(play_dtmf); |
| 822 | } |
| 823 | RTC_DCHECK_GE(sync_buffer_->FutureLength() - expand_->overlap_length(), |
| 824 | output_size_samples_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 825 | break; |
| 826 | } |
Henrik Lundin | cf808d2 | 2015-05-27 14:33:29 +0200 | [diff] [blame] | 827 | case kAccelerate: |
| 828 | case kFastAccelerate: { |
| 829 | const bool fast_accelerate = |
| 830 | enable_fast_accelerate_ && (operation == kFastAccelerate); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 831 | return_value = DoAccelerate(decoded_buffer_.get(), length, speech_type, |
Henrik Lundin | cf808d2 | 2015-05-27 14:33:29 +0200 | [diff] [blame] | 832 | play_dtmf, fast_accelerate); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 833 | break; |
| 834 | } |
| 835 | case kPreemptiveExpand: { |
| 836 | return_value = DoPreemptiveExpand(decoded_buffer_.get(), length, |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 837 | speech_type, play_dtmf); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 838 | break; |
| 839 | } |
| 840 | case kRfc3389Cng: |
| 841 | case kRfc3389CngNoPacket: { |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 842 | return_value = DoRfc3389Cng(&packet_list, play_dtmf); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 843 | break; |
| 844 | } |
| 845 | case kCodecInternalCng: { |
| 846 | // This handles the case when there is no transmission and the decoder |
| 847 | // should produce internal comfort noise. |
| 848 | // TODO(hlundin): Write test for codec-internal CNG. |
minyuel | 6d92bf5 | 2015-09-23 15:20:39 +0200 | [diff] [blame] | 849 | DoCodecInternalCng(decoded_buffer_.get(), length); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 850 | break; |
| 851 | } |
| 852 | case kDtmf: { |
| 853 | // TODO(hlundin): Write test for this. |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 854 | return_value = DoDtmf(dtmf_event, &play_dtmf); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 855 | break; |
| 856 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 857 | case kUndefined: { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 858 | RTC_LOG(LS_ERROR) << "Invalid operation kUndefined."; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 859 | assert(false); // This should not happen. |
| 860 | last_mode_ = kModeError; |
| 861 | return kInvalidOperation; |
| 862 | } |
| 863 | } // End of switch. |
minyue | 5bd3397 | 2016-05-02 04:46:11 -0700 | [diff] [blame] | 864 | last_operation_ = operation; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 865 | if (return_value < 0) { |
| 866 | return return_value; |
| 867 | } |
| 868 | |
| 869 | if (last_mode_ != kModeRfc3389Cng) { |
| 870 | comfort_noise_->Reset(); |
| 871 | } |
| 872 | |
| 873 | // Copy from |algorithm_buffer| to |sync_buffer_|. |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 874 | sync_buffer_->PushBack(*algorithm_buffer_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 875 | |
| 876 | // Extract data from |sync_buffer_| to |output|. |
turaj@webrtc.org | 362a55e | 2013-09-20 16:25:28 +0000 | [diff] [blame] | 877 | size_t num_output_samples_per_channel = output_size_samples_; |
| 878 | size_t num_output_samples = output_size_samples_ * sync_buffer_->Channels(); |
henrik.lundin | 6d8e011 | 2016-03-04 10:34:21 -0800 | [diff] [blame] | 879 | if (num_output_samples > AudioFrame::kMaxDataSizeSamples) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 880 | RTC_LOG(LS_WARNING) << "Output array is too short. " |
| 881 | << AudioFrame::kMaxDataSizeSamples << " < " |
| 882 | << output_size_samples_ << " * " |
| 883 | << sync_buffer_->Channels(); |
henrik.lundin | 6d8e011 | 2016-03-04 10:34:21 -0800 | [diff] [blame] | 884 | num_output_samples = AudioFrame::kMaxDataSizeSamples; |
| 885 | num_output_samples_per_channel = |
| 886 | AudioFrame::kMaxDataSizeSamples / sync_buffer_->Channels(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 887 | } |
henrik.lundin | 6d8e011 | 2016-03-04 10:34:21 -0800 | [diff] [blame] | 888 | sync_buffer_->GetNextAudioInterleaved(num_output_samples_per_channel, |
| 889 | audio_frame); |
| 890 | audio_frame->sample_rate_hz_ = fs_hz_; |
Henrik Lundin | 05f71fc | 2015-09-01 11:51:58 +0200 | [diff] [blame] | 891 | if (sync_buffer_->FutureLength() < expand_->overlap_length()) { |
| 892 | // The sync buffer should always contain |overlap_length| samples, but now |
| 893 | // too many samples have been extracted. Reinstall the |overlap_length| |
| 894 | // lookahead by moving the index. |
| 895 | const size_t missing_lookahead_samples = |
| 896 | expand_->overlap_length() - sync_buffer_->FutureLength(); |
henrikg | 91d6ede | 2015-09-17 00:24:34 -0700 | [diff] [blame] | 897 | RTC_DCHECK_GE(sync_buffer_->next_index(), missing_lookahead_samples); |
Henrik Lundin | 05f71fc | 2015-09-01 11:51:58 +0200 | [diff] [blame] | 898 | sync_buffer_->set_next_index(sync_buffer_->next_index() - |
| 899 | missing_lookahead_samples); |
| 900 | } |
henrik.lundin | 6d8e011 | 2016-03-04 10:34:21 -0800 | [diff] [blame] | 901 | if (audio_frame->samples_per_channel_ != output_size_samples_) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 902 | RTC_LOG(LS_ERROR) << "audio_frame->samples_per_channel_ (" |
| 903 | << audio_frame->samples_per_channel_ |
| 904 | << ") != output_size_samples_ (" << output_size_samples_ |
| 905 | << ")"; |
minyue@webrtc.org | db1cefc | 2013-08-13 01:39:21 +0000 | [diff] [blame] | 906 | // TODO(minyue): treatment of under-run, filling zeros |
yujo | 36b1a5f | 2017-06-12 12:45:32 -0700 | [diff] [blame] | 907 | audio_frame->Mute(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 908 | return kSampleUnderrun; |
| 909 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 910 | |
| 911 | // Should always have overlap samples left in the |sync_buffer_|. |
henrikg | 91d6ede | 2015-09-17 00:24:34 -0700 | [diff] [blame] | 912 | RTC_DCHECK_GE(sync_buffer_->FutureLength(), expand_->overlap_length()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 913 | |
yujo | 36b1a5f | 2017-06-12 12:45:32 -0700 | [diff] [blame] | 914 | // TODO(yujo): For muted frames, this can be a copy rather than an addition. |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 915 | if (play_dtmf) { |
yujo | 36b1a5f | 2017-06-12 12:45:32 -0700 | [diff] [blame] | 916 | return_value = DtmfOverdub(dtmf_event, sync_buffer_->Channels(), |
| 917 | audio_frame->mutable_data()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 918 | } |
| 919 | |
| 920 | // Update the background noise parameters if last operation wrote data |
| 921 | // straight from the decoder to the |sync_buffer_|. That is, none of the |
| 922 | // operations that modify the signal can be followed by a parameter update. |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 923 | if ((last_mode_ == kModeNormal) || (last_mode_ == kModeAccelerateFail) || |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 924 | (last_mode_ == kModePreemptiveExpandFail) || |
| 925 | (last_mode_ == kModeRfc3389Cng) || |
| 926 | (last_mode_ == kModeCodecInternalCng)) { |
| 927 | background_noise_->Update(*sync_buffer_, *vad_.get()); |
| 928 | } |
| 929 | |
| 930 | if (operation == kDtmf) { |
| 931 | // DTMF data was written the end of |sync_buffer_|. |
| 932 | // Update index to end of DTMF data in |sync_buffer_|. |
| 933 | sync_buffer_->set_dtmf_index(sync_buffer_->Size()); |
| 934 | } |
| 935 | |
Henrik Lundin | 00eb12a | 2018-09-05 18:14:52 +0200 | [diff] [blame] | 936 | if (last_mode_ != kModeExpand && last_mode_ != kModeCodecPlc) { |
henrik.lundin@webrtc.org | ed865b5 | 2014-03-06 10:28:07 +0000 | [diff] [blame] | 937 | // If last operation was not expand, calculate the |playout_timestamp_| from |
| 938 | // the |sync_buffer_|. However, do not update the |playout_timestamp_| if it |
| 939 | // would be moved "backwards". |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 940 | uint32_t temp_timestamp = |
| 941 | sync_buffer_->end_timestamp() - |
turaj@webrtc.org | 362a55e | 2013-09-20 16:25:28 +0000 | [diff] [blame] | 942 | static_cast<uint32_t>(sync_buffer_->FutureLength()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 943 | if (static_cast<int32_t>(temp_timestamp - playout_timestamp_) > 0) { |
| 944 | playout_timestamp_ = temp_timestamp; |
| 945 | } |
| 946 | } else { |
| 947 | // Use dead reckoning to estimate the |playout_timestamp_|. |
Peter Kasting | b7e5054 | 2015-06-11 12:55:50 -0700 | [diff] [blame] | 948 | playout_timestamp_ += static_cast<uint32_t>(output_size_samples_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 949 | } |
henrik.lundin | 15c51e3 | 2016-04-06 08:38:56 -0700 | [diff] [blame] | 950 | // Set the timestamp in the audio frame to zero before the first packet has |
| 951 | // been inserted. Otherwise, subtract the frame size in samples to get the |
| 952 | // timestamp of the first sample in the frame (playout_timestamp_ is the |
| 953 | // last + 1). |
| 954 | audio_frame->timestamp_ = |
| 955 | first_packet_ |
| 956 | ? 0 |
| 957 | : timestamp_scaler_->ToExternal(playout_timestamp_) - |
| 958 | static_cast<uint32_t>(audio_frame->samples_per_channel_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 959 | |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 960 | if (!(last_mode_ == kModeRfc3389Cng || last_mode_ == kModeCodecInternalCng || |
Henrik Lundin | 00eb12a | 2018-09-05 18:14:52 +0200 | [diff] [blame] | 961 | last_mode_ == kModeExpand || last_mode_ == kModeCodecPlc)) { |
henrik.lundin | b1fb72b | 2016-05-03 08:18:47 -0700 | [diff] [blame] | 962 | generated_noise_stopwatch_.reset(); |
| 963 | } |
| 964 | |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 965 | if (decode_return_value) |
| 966 | return decode_return_value; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 967 | return return_value; |
| 968 | } |
| 969 | |
| 970 | int NetEqImpl::GetDecision(Operations* operation, |
| 971 | PacketList* packet_list, |
| 972 | DtmfEvent* dtmf_event, |
Ivo Creusen | 55de08e | 2018-09-03 11:49:27 +0200 | [diff] [blame] | 973 | bool* play_dtmf, |
| 974 | absl::optional<Operations> action_override) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 975 | // Initialize output variables. |
| 976 | *play_dtmf = false; |
| 977 | *operation = kUndefined; |
| 978 | |
henrik.lundin@webrtc.org | 0d5da25 | 2013-09-18 21:12:38 +0000 | [diff] [blame] | 979 | assert(sync_buffer_.get()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 980 | uint32_t end_timestamp = sync_buffer_->end_timestamp(); |
henrik.lundin@webrtc.org | 52b42cb | 2014-11-04 14:03:58 +0000 | [diff] [blame] | 981 | if (!new_codec_) { |
| 982 | const uint32_t five_seconds_samples = 5 * fs_hz_; |
minyue-webrtc | fae474c | 2017-07-05 11:17:40 +0200 | [diff] [blame] | 983 | packet_buffer_->DiscardOldPackets(end_timestamp, five_seconds_samples, |
| 984 | &stats_); |
henrik.lundin@webrtc.org | 52b42cb | 2014-11-04 14:03:58 +0000 | [diff] [blame] | 985 | } |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 986 | const Packet* packet = packet_buffer_->PeekNextPacket(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 987 | |
henrik.lundin | b1fb72b | 2016-05-03 08:18:47 -0700 | [diff] [blame] | 988 | RTC_DCHECK(!generated_noise_stopwatch_ || |
| 989 | generated_noise_stopwatch_->ElapsedTicks() >= 1); |
| 990 | uint64_t generated_noise_samples = |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 991 | generated_noise_stopwatch_ ? (generated_noise_stopwatch_->ElapsedTicks() - |
| 992 | 1) * output_size_samples_ + |
| 993 | decision_logic_->noise_fast_forward() |
| 994 | : 0; |
henrik.lundin | b1fb72b | 2016-05-03 08:18:47 -0700 | [diff] [blame] | 995 | |
henrik.lundin@webrtc.org | ca8cb95 | 2014-03-12 10:26:52 +0000 | [diff] [blame] | 996 | if (decision_logic_->CngRfc3389On() || last_mode_ == kModeRfc3389Cng) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 997 | // Because of timestamp peculiarities, we have to "manually" disallow using |
| 998 | // a CNG packet with the same timestamp as the one that was last played. |
| 999 | // This can happen when using redundancy and will cause the timing to shift. |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1000 | while (packet && decoder_database_->IsComfortNoise(packet->payload_type) && |
| 1001 | (end_timestamp >= packet->timestamp || |
| 1002 | end_timestamp + generated_noise_samples > packet->timestamp)) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1003 | // Don't use this packet, discard it. |
minyue-webrtc | fae474c | 2017-07-05 11:17:40 +0200 | [diff] [blame] | 1004 | if (packet_buffer_->DiscardNextPacket(&stats_) != PacketBuffer::kOK) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1005 | assert(false); // Must be ok by design. |
| 1006 | } |
| 1007 | // Check buffer again. |
| 1008 | if (!new_codec_) { |
minyue-webrtc | fae474c | 2017-07-05 11:17:40 +0200 | [diff] [blame] | 1009 | packet_buffer_->DiscardOldPackets(end_timestamp, 5 * fs_hz_, &stats_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1010 | } |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1011 | packet = packet_buffer_->PeekNextPacket(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1012 | } |
| 1013 | } |
| 1014 | |
henrik.lundin@webrtc.org | 0d5da25 | 2013-09-18 21:12:38 +0000 | [diff] [blame] | 1015 | assert(expand_.get()); |
turaj@webrtc.org | 362a55e | 2013-09-20 16:25:28 +0000 | [diff] [blame] | 1016 | const int samples_left = static_cast<int>(sync_buffer_->FutureLength() - |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1017 | expand_->overlap_length()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1018 | if (last_mode_ == kModeAccelerateSuccess || |
| 1019 | last_mode_ == kModeAccelerateLowEnergy || |
| 1020 | last_mode_ == kModePreemptiveExpandSuccess || |
| 1021 | last_mode_ == kModePreemptiveExpandLowEnergy) { |
| 1022 | // Subtract (samples_left + output_size_samples_) from sampleMemory. |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1023 | decision_logic_->AddSampleMemory( |
kwiberg | d3edd77 | 2017-03-01 18:52:48 -0800 | [diff] [blame] | 1024 | -(samples_left + rtc::dchecked_cast<int>(output_size_samples_))); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1025 | } |
| 1026 | |
| 1027 | // Check if it is time to play a DTMF event. |
Peter Kasting | b7e5054 | 2015-06-11 12:55:50 -0700 | [diff] [blame] | 1028 | if (dtmf_buffer_->GetEvent( |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1029 | static_cast<uint32_t>(end_timestamp + generated_noise_samples), |
| 1030 | dtmf_event)) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1031 | *play_dtmf = true; |
| 1032 | } |
| 1033 | |
| 1034 | // Get instruction. |
henrik.lundin@webrtc.org | 0d5da25 | 2013-09-18 21:12:38 +0000 | [diff] [blame] | 1035 | assert(sync_buffer_.get()); |
| 1036 | assert(expand_.get()); |
henrik.lundin | b1fb72b | 2016-05-03 08:18:47 -0700 | [diff] [blame] | 1037 | generated_noise_samples = |
| 1038 | generated_noise_stopwatch_ |
| 1039 | ? generated_noise_stopwatch_->ElapsedTicks() * output_size_samples_ + |
| 1040 | decision_logic_->noise_fast_forward() |
| 1041 | : 0; |
| 1042 | *operation = decision_logic_->GetDecision( |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1043 | *sync_buffer_, *expand_, decoder_frame_length_, packet, last_mode_, |
henrik.lundin | b1fb72b | 2016-05-03 08:18:47 -0700 | [diff] [blame] | 1044 | *play_dtmf, generated_noise_samples, &reset_decoder_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1045 | |
Ivo Creusen | 55de08e | 2018-09-03 11:49:27 +0200 | [diff] [blame] | 1046 | if (action_override) { |
| 1047 | // Use the provided action instead of the decision NetEq decided on. |
| 1048 | *operation = *action_override; |
| 1049 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1050 | // Check if we already have enough samples in the |sync_buffer_|. If so, |
| 1051 | // change decision to normal, unless the decision was merge, accelerate, or |
| 1052 | // preemptive expand. |
kwiberg | d3edd77 | 2017-03-01 18:52:48 -0800 | [diff] [blame] | 1053 | if (samples_left >= rtc::dchecked_cast<int>(output_size_samples_) && |
| 1054 | *operation != kMerge && *operation != kAccelerate && |
| 1055 | *operation != kFastAccelerate && *operation != kPreemptiveExpand) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1056 | *operation = kNormal; |
| 1057 | return 0; |
| 1058 | } |
| 1059 | |
turaj@webrtc.org | 8d1cdaa | 2014-04-11 18:47:55 +0000 | [diff] [blame] | 1060 | decision_logic_->ExpandDecision(*operation); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1061 | |
| 1062 | // Check conditions for reset. |
| 1063 | if (new_codec_ || *operation == kUndefined) { |
| 1064 | // The only valid reason to get kUndefined is that new_codec_ is set. |
| 1065 | assert(new_codec_); |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1066 | if (*play_dtmf && !packet) { |
turaj@webrtc.org | 4d06db5 | 2013-03-27 18:31:42 +0000 | [diff] [blame] | 1067 | timestamp_ = dtmf_event->timestamp; |
| 1068 | } else { |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1069 | if (!packet) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1070 | RTC_LOG(LS_ERROR) << "Packet missing where it shouldn't."; |
turaj@webrtc.org | 4d06db5 | 2013-03-27 18:31:42 +0000 | [diff] [blame] | 1071 | return -1; |
| 1072 | } |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1073 | timestamp_ = packet->timestamp; |
ossu | 108ecec | 2016-07-08 08:45:18 -0700 | [diff] [blame] | 1074 | if (*operation == kRfc3389CngNoPacket && |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1075 | decoder_database_->IsComfortNoise(packet->payload_type)) { |
turaj@webrtc.org | 4d06db5 | 2013-03-27 18:31:42 +0000 | [diff] [blame] | 1076 | // Change decision to CNG packet, since we do have a CNG packet, but it |
| 1077 | // was considered too early to use. Now, use it anyway. |
| 1078 | *operation = kRfc3389Cng; |
| 1079 | } else if (*operation != kRfc3389Cng) { |
| 1080 | *operation = kNormal; |
| 1081 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1082 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1083 | // Adjust |sync_buffer_| timestamp before setting |end_timestamp| to the |
| 1084 | // new value. |
| 1085 | sync_buffer_->IncreaseEndTimestamp(timestamp_ - end_timestamp); |
turaj@webrtc.org | 4d06db5 | 2013-03-27 18:31:42 +0000 | [diff] [blame] | 1086 | end_timestamp = timestamp_; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1087 | new_codec_ = false; |
| 1088 | decision_logic_->SoftReset(); |
| 1089 | buffer_level_filter_->Reset(); |
| 1090 | delay_manager_->Reset(); |
| 1091 | stats_.ResetMcu(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1092 | } |
| 1093 | |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1094 | size_t required_samples = output_size_samples_; |
| 1095 | const size_t samples_10_ms = static_cast<size_t>(80 * fs_mult_); |
| 1096 | const size_t samples_20_ms = 2 * samples_10_ms; |
| 1097 | const size_t samples_30_ms = 3 * samples_10_ms; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1098 | |
| 1099 | switch (*operation) { |
| 1100 | case kExpand: { |
| 1101 | timestamp_ = end_timestamp; |
| 1102 | return 0; |
| 1103 | } |
| 1104 | case kRfc3389CngNoPacket: |
| 1105 | case kCodecInternalCng: { |
| 1106 | return 0; |
| 1107 | } |
| 1108 | case kDtmf: { |
| 1109 | // TODO(hlundin): Write test for this. |
| 1110 | // Update timestamp. |
| 1111 | timestamp_ = end_timestamp; |
henrik.lundin | b1fb72b | 2016-05-03 08:18:47 -0700 | [diff] [blame] | 1112 | const uint64_t generated_noise_samples = |
| 1113 | generated_noise_stopwatch_ |
| 1114 | ? generated_noise_stopwatch_->ElapsedTicks() * |
| 1115 | output_size_samples_ + |
| 1116 | decision_logic_->noise_fast_forward() |
| 1117 | : 0; |
| 1118 | if (generated_noise_samples > 0 && last_mode_ != kModeDtmf) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1119 | // Make a jump in timestamp due to the recently played comfort noise. |
Peter Kasting | b7e5054 | 2015-06-11 12:55:50 -0700 | [diff] [blame] | 1120 | uint32_t timestamp_jump = |
henrik.lundin | b1fb72b | 2016-05-03 08:18:47 -0700 | [diff] [blame] | 1121 | static_cast<uint32_t>(generated_noise_samples); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1122 | sync_buffer_->IncreaseEndTimestamp(timestamp_jump); |
| 1123 | timestamp_ += timestamp_jump; |
| 1124 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1125 | return 0; |
| 1126 | } |
Henrik Lundin | cf808d2 | 2015-05-27 14:33:29 +0200 | [diff] [blame] | 1127 | case kAccelerate: |
| 1128 | case kFastAccelerate: { |
| 1129 | // In order to do an accelerate we need at least 30 ms of audio data. |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1130 | if (samples_left >= static_cast<int>(samples_30_ms)) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1131 | // Already have enough data, so we do not need to extract any more. |
| 1132 | decision_logic_->set_sample_memory(samples_left); |
| 1133 | decision_logic_->set_prev_time_scale(true); |
| 1134 | return 0; |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1135 | } else if (samples_left >= static_cast<int>(samples_10_ms) && |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1136 | decoder_frame_length_ >= samples_30_ms) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1137 | // Avoid decoding more data as it might overflow the playout buffer. |
| 1138 | *operation = kNormal; |
| 1139 | return 0; |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1140 | } else if (samples_left < static_cast<int>(samples_20_ms) && |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1141 | decoder_frame_length_ < samples_30_ms) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1142 | // Build up decoded data by decoding at least 20 ms of audio data. Do |
| 1143 | // not perform accelerate yet, but wait until we only need to do one |
| 1144 | // decoding. |
| 1145 | required_samples = 2 * output_size_samples_; |
| 1146 | *operation = kNormal; |
| 1147 | } |
| 1148 | // If none of the above is true, we have one of two possible situations: |
| 1149 | // (1) 20 ms <= samples_left < 30 ms and decoder_frame_length_ < 30 ms; or |
| 1150 | // (2) samples_left < 10 ms and decoder_frame_length_ >= 30 ms. |
| 1151 | // In either case, we move on with the accelerate decision, and decode one |
| 1152 | // frame now. |
| 1153 | break; |
| 1154 | } |
| 1155 | case kPreemptiveExpand: { |
| 1156 | // In order to do a preemptive expand we need at least 30 ms of decoded |
| 1157 | // audio data. |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1158 | if ((samples_left >= static_cast<int>(samples_30_ms)) || |
| 1159 | (samples_left >= static_cast<int>(samples_10_ms) && |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1160 | decoder_frame_length_ >= samples_30_ms)) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1161 | // Already have enough data, so we do not need to extract any more. |
| 1162 | // Or, avoid decoding more data as it might overflow the playout buffer. |
| 1163 | // Still try preemptive expand, though. |
| 1164 | decision_logic_->set_sample_memory(samples_left); |
| 1165 | decision_logic_->set_prev_time_scale(true); |
| 1166 | return 0; |
| 1167 | } |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1168 | if (samples_left < static_cast<int>(samples_20_ms) && |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1169 | decoder_frame_length_ < samples_30_ms) { |
| 1170 | // Build up decoded data by decoding at least 20 ms of audio data. |
| 1171 | // Still try to perform preemptive expand. |
| 1172 | required_samples = 2 * output_size_samples_; |
| 1173 | } |
| 1174 | // Move on with the preemptive expand decision. |
| 1175 | break; |
| 1176 | } |
turaj@webrtc.org | 8d1cdaa | 2014-04-11 18:47:55 +0000 | [diff] [blame] | 1177 | case kMerge: { |
| 1178 | required_samples = |
| 1179 | std::max(merge_->RequiredFutureSamples(), required_samples); |
| 1180 | break; |
| 1181 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1182 | default: { |
| 1183 | // Do nothing. |
| 1184 | } |
| 1185 | } |
| 1186 | |
| 1187 | // Get packets from buffer. |
| 1188 | int extracted_samples = 0; |
Henrik Lundin | 7687ad5 | 2018-07-02 10:14:46 +0200 | [diff] [blame] | 1189 | if (packet) { |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1190 | sync_buffer_->IncreaseEndTimestamp(packet->timestamp - end_timestamp); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1191 | if (decision_logic_->CngOff()) { |
| 1192 | // Adjustment of timestamp only corresponds to an actual packet loss |
| 1193 | // if comfort noise is not played. If comfort noise was just played, |
| 1194 | // this adjustment of timestamp is only done to get back in sync with the |
| 1195 | // stream timestamp; no loss to report. |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1196 | stats_.LostSamples(packet->timestamp - end_timestamp); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1197 | } |
| 1198 | |
| 1199 | if (*operation != kRfc3389Cng) { |
| 1200 | // We are about to decode and use a non-CNG packet. |
| 1201 | decision_logic_->SetCngOff(); |
| 1202 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1203 | |
| 1204 | extracted_samples = ExtractPackets(required_samples, packet_list); |
| 1205 | if (extracted_samples < 0) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1206 | return kPacketBufferCorruption; |
| 1207 | } |
| 1208 | } |
| 1209 | |
Henrik Lundin | cf808d2 | 2015-05-27 14:33:29 +0200 | [diff] [blame] | 1210 | if (*operation == kAccelerate || *operation == kFastAccelerate || |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1211 | *operation == kPreemptiveExpand) { |
| 1212 | decision_logic_->set_sample_memory(samples_left + extracted_samples); |
| 1213 | decision_logic_->set_prev_time_scale(true); |
| 1214 | } |
| 1215 | |
Henrik Lundin | cf808d2 | 2015-05-27 14:33:29 +0200 | [diff] [blame] | 1216 | if (*operation == kAccelerate || *operation == kFastAccelerate) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1217 | // Check that we have enough data (30ms) to do accelerate. |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1218 | if (extracted_samples + samples_left < static_cast<int>(samples_30_ms)) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1219 | // TODO(hlundin): Write test for this. |
| 1220 | // Not enough, do normal operation instead. |
| 1221 | *operation = kNormal; |
| 1222 | } |
| 1223 | } |
| 1224 | |
| 1225 | timestamp_ = end_timestamp; |
| 1226 | return 0; |
| 1227 | } |
| 1228 | |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1229 | int NetEqImpl::Decode(PacketList* packet_list, |
| 1230 | Operations* operation, |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1231 | int* decoded_length, |
| 1232 | AudioDecoder::SpeechType* speech_type) { |
| 1233 | *speech_type = AudioDecoder::kSpeech; |
minyuel | 6d92bf5 | 2015-09-23 15:20:39 +0200 | [diff] [blame] | 1234 | |
| 1235 | // When packet_list is empty, we may be in kCodecInternalCng mode, and for |
| 1236 | // that we use current active decoder. |
| 1237 | AudioDecoder* decoder = decoder_database_->GetActiveDecoder(); |
| 1238 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1239 | if (!packet_list->empty()) { |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 1240 | const Packet& packet = packet_list->front(); |
| 1241 | uint8_t payload_type = packet.payload_type; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1242 | if (!decoder_database_->IsComfortNoise(payload_type)) { |
| 1243 | decoder = decoder_database_->GetDecoder(payload_type); |
| 1244 | assert(decoder); |
| 1245 | if (!decoder) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1246 | RTC_LOG(LS_WARNING) |
| 1247 | << "Unknown payload type " << static_cast<int>(payload_type); |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 1248 | packet_list->clear(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1249 | return kDecoderNotFound; |
| 1250 | } |
| 1251 | bool decoder_changed; |
| 1252 | decoder_database_->SetActiveDecoder(payload_type, &decoder_changed); |
| 1253 | if (decoder_changed) { |
| 1254 | // We have a new decoder. Re-init some values. |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1255 | const DecoderDatabase::DecoderInfo* decoder_info = |
| 1256 | decoder_database_->GetDecoderInfo(payload_type); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1257 | assert(decoder_info); |
| 1258 | if (!decoder_info) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1259 | RTC_LOG(LS_WARNING) |
| 1260 | << "Unknown payload type " << static_cast<int>(payload_type); |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 1261 | packet_list->clear(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1262 | return kDecoderNotFound; |
| 1263 | } |
tina.legrand@webrtc.org | ba5a6c3 | 2014-03-23 09:58:48 +0000 | [diff] [blame] | 1264 | // If sampling rate or number of channels has changed, we need to make |
| 1265 | // a reset. |
kwiberg | c0f2dcf | 2016-05-31 06:28:03 -0700 | [diff] [blame] | 1266 | if (decoder_info->SampleRateHz() != fs_hz_ || |
henrik.lundin@webrtc.org | 6dba1eb | 2015-03-18 09:47:08 +0000 | [diff] [blame] | 1267 | decoder->Channels() != algorithm_buffer_->Channels()) { |
tina.legrand@webrtc.org | ba5a6c3 | 2014-03-23 09:58:48 +0000 | [diff] [blame] | 1268 | // TODO(tlegrand): Add unittest to cover this event. |
kwiberg | c0f2dcf | 2016-05-31 06:28:03 -0700 | [diff] [blame] | 1269 | SetSampleRateAndChannels(decoder_info->SampleRateHz(), |
| 1270 | decoder->Channels()); |
turaj@webrtc.org | a6101d7 | 2013-10-01 22:01:09 +0000 | [diff] [blame] | 1271 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1272 | sync_buffer_->set_end_timestamp(timestamp_); |
| 1273 | playout_timestamp_ = timestamp_; |
| 1274 | } |
| 1275 | } |
| 1276 | } |
| 1277 | |
| 1278 | if (reset_decoder_) { |
| 1279 | // TODO(hlundin): Write test for this. |
Karl Wiberg | 4376648 | 2015-08-27 15:22:11 +0200 | [diff] [blame] | 1280 | if (decoder) |
| 1281 | decoder->Reset(); |
| 1282 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1283 | // Reset comfort noise decoder. |
ossu | 97ba30e | 2016-04-25 07:55:58 -0700 | [diff] [blame] | 1284 | ComfortNoiseDecoder* cng_decoder = decoder_database_->GetActiveCngDecoder(); |
Karl Wiberg | 4376648 | 2015-08-27 15:22:11 +0200 | [diff] [blame] | 1285 | if (cng_decoder) |
| 1286 | cng_decoder->Reset(); |
| 1287 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1288 | reset_decoder_ = false; |
| 1289 | } |
| 1290 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1291 | *decoded_length = 0; |
| 1292 | // Update codec-internal PLC state. |
| 1293 | if ((*operation == kMerge) && decoder && decoder->HasDecodePlc()) { |
| 1294 | decoder->DecodePlc(1, &decoded_buffer_[*decoded_length]); |
| 1295 | } |
| 1296 | |
minyuel | 6d92bf5 | 2015-09-23 15:20:39 +0200 | [diff] [blame] | 1297 | int return_value; |
| 1298 | if (*operation == kCodecInternalCng) { |
| 1299 | RTC_DCHECK(packet_list->empty()); |
| 1300 | return_value = DecodeCng(decoder, decoded_length, speech_type); |
| 1301 | } else { |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1302 | return_value = DecodeLoop(packet_list, *operation, decoder, decoded_length, |
| 1303 | speech_type); |
minyuel | 6d92bf5 | 2015-09-23 15:20:39 +0200 | [diff] [blame] | 1304 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1305 | |
| 1306 | if (*decoded_length < 0) { |
| 1307 | // Error returned from the decoder. |
| 1308 | *decoded_length = 0; |
Peter Kasting | b7e5054 | 2015-06-11 12:55:50 -0700 | [diff] [blame] | 1309 | sync_buffer_->IncreaseEndTimestamp( |
| 1310 | static_cast<uint32_t>(decoder_frame_length_)); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1311 | int error_code = 0; |
| 1312 | if (decoder) |
| 1313 | error_code = decoder->ErrorCode(); |
| 1314 | if (error_code != 0) { |
| 1315 | // Got some error code from the decoder. |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1316 | return_value = kDecoderErrorCode; |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1317 | RTC_LOG(LS_WARNING) << "Decoder returned error code: " << error_code; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1318 | } else { |
| 1319 | // Decoder does not implement error codes. Return generic error. |
| 1320 | return_value = kOtherDecoderError; |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1321 | RTC_LOG(LS_WARNING) << "Decoder error (no error code)"; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1322 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1323 | *operation = kExpand; // Do expansion to get data instead. |
| 1324 | } |
| 1325 | if (*speech_type != AudioDecoder::kComfortNoise) { |
| 1326 | // Don't increment timestamp if codec returned CNG speech type |
| 1327 | // since in this case, the we will increment the CNGplayedTS counter. |
| 1328 | // Increase with number of samples per channel. |
| 1329 | assert(*decoded_length == 0 || |
henrik.lundin@webrtc.org | 6dba1eb | 2015-03-18 09:47:08 +0000 | [diff] [blame] | 1330 | (decoder && decoder->Channels() == sync_buffer_->Channels())); |
turaj@webrtc.org | 362a55e | 2013-09-20 16:25:28 +0000 | [diff] [blame] | 1331 | sync_buffer_->IncreaseEndTimestamp( |
| 1332 | *decoded_length / static_cast<int>(sync_buffer_->Channels())); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1333 | } |
| 1334 | return return_value; |
| 1335 | } |
| 1336 | |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1337 | int NetEqImpl::DecodeCng(AudioDecoder* decoder, |
| 1338 | int* decoded_length, |
minyuel | 6d92bf5 | 2015-09-23 15:20:39 +0200 | [diff] [blame] | 1339 | AudioDecoder::SpeechType* speech_type) { |
| 1340 | if (!decoder) { |
| 1341 | // This happens when active decoder is not defined. |
| 1342 | *decoded_length = -1; |
| 1343 | return 0; |
| 1344 | } |
| 1345 | |
kwiberg | d3edd77 | 2017-03-01 18:52:48 -0800 | [diff] [blame] | 1346 | while (*decoded_length < rtc::dchecked_cast<int>(output_size_samples_)) { |
minyuel | 6d92bf5 | 2015-09-23 15:20:39 +0200 | [diff] [blame] | 1347 | const int length = decoder->Decode( |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1348 | nullptr, 0, fs_hz_, |
| 1349 | (decoded_buffer_length_ - *decoded_length) * sizeof(int16_t), |
| 1350 | &decoded_buffer_[*decoded_length], speech_type); |
minyuel | 6d92bf5 | 2015-09-23 15:20:39 +0200 | [diff] [blame] | 1351 | if (length > 0) { |
| 1352 | *decoded_length += length; |
minyuel | 6d92bf5 | 2015-09-23 15:20:39 +0200 | [diff] [blame] | 1353 | } else { |
| 1354 | // Error. |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1355 | RTC_LOG(LS_WARNING) << "Failed to decode CNG"; |
minyuel | 6d92bf5 | 2015-09-23 15:20:39 +0200 | [diff] [blame] | 1356 | *decoded_length = -1; |
| 1357 | break; |
| 1358 | } |
| 1359 | if (*decoded_length > static_cast<int>(decoded_buffer_length_)) { |
| 1360 | // Guard against overflow. |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1361 | RTC_LOG(LS_WARNING) << "Decoded too much CNG."; |
minyuel | 6d92bf5 | 2015-09-23 15:20:39 +0200 | [diff] [blame] | 1362 | return kDecodedTooMuch; |
| 1363 | } |
| 1364 | } |
| 1365 | return 0; |
| 1366 | } |
| 1367 | |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1368 | int NetEqImpl::DecodeLoop(PacketList* packet_list, |
| 1369 | const Operations& operation, |
| 1370 | AudioDecoder* decoder, |
| 1371 | int* decoded_length, |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1372 | AudioDecoder::SpeechType* speech_type) { |
henrik.lundin | 114c1b3 | 2017-04-26 07:47:32 -0700 | [diff] [blame] | 1373 | RTC_DCHECK(last_decoded_timestamps_.empty()); |
| 1374 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1375 | // Do decoding. |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1376 | while (!packet_list->empty() && !decoder_database_->IsComfortNoise( |
| 1377 | packet_list->front().payload_type)) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1378 | assert(decoder); // At this point, we must have a decoder object. |
| 1379 | // The number of channels in the |sync_buffer_| should be the same as the |
| 1380 | // number decoder channels. |
henrik.lundin@webrtc.org | 6dba1eb | 2015-03-18 09:47:08 +0000 | [diff] [blame] | 1381 | assert(sync_buffer_->Channels() == decoder->Channels()); |
| 1382 | assert(decoded_buffer_length_ >= kMaxFrameSize * decoder->Channels()); |
minyuel | 6d92bf5 | 2015-09-23 15:20:39 +0200 | [diff] [blame] | 1383 | assert(operation == kNormal || operation == kAccelerate || |
| 1384 | operation == kFastAccelerate || operation == kMerge || |
| 1385 | operation == kPreemptiveExpand); |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 1386 | |
| 1387 | auto opt_result = packet_list->front().frame->Decode( |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 1388 | rtc::ArrayView<int16_t>(&decoded_buffer_[*decoded_length], |
| 1389 | decoded_buffer_length_ - *decoded_length)); |
henrik.lundin | 114c1b3 | 2017-04-26 07:47:32 -0700 | [diff] [blame] | 1390 | last_decoded_timestamps_.push_back(packet_list->front().timestamp); |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 1391 | packet_list->pop_front(); |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 1392 | if (opt_result) { |
| 1393 | const auto& result = *opt_result; |
| 1394 | *speech_type = result.speech_type; |
| 1395 | if (result.num_decoded_samples > 0) { |
kwiberg | d3edd77 | 2017-03-01 18:52:48 -0800 | [diff] [blame] | 1396 | *decoded_length += rtc::dchecked_cast<int>(result.num_decoded_samples); |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 1397 | // Update |decoder_frame_length_| with number of samples per channel. |
| 1398 | decoder_frame_length_ = |
| 1399 | result.num_decoded_samples / decoder->Channels(); |
| 1400 | } |
| 1401 | } else { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1402 | // Error. |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 1403 | // TODO(ossu): What to put here? |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1404 | RTC_LOG(LS_WARNING) << "Decode error"; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1405 | *decoded_length = -1; |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 1406 | packet_list->clear(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1407 | break; |
| 1408 | } |
kwiberg | d3edd77 | 2017-03-01 18:52:48 -0800 | [diff] [blame] | 1409 | if (*decoded_length > rtc::dchecked_cast<int>(decoded_buffer_length_)) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1410 | // Guard against overflow. |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1411 | RTC_LOG(LS_WARNING) << "Decoded too much."; |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 1412 | packet_list->clear(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1413 | return kDecodedTooMuch; |
| 1414 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1415 | } // End of decode loop. |
| 1416 | |
turaj@webrtc.org | 58cd316 | 2013-10-31 15:15:55 +0000 | [diff] [blame] | 1417 | // If the list is not empty at this point, either a decoding error terminated |
| 1418 | // the while-loop, or list must hold exactly one CNG packet. |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1419 | assert(packet_list->empty() || *decoded_length < 0 || |
| 1420 | (packet_list->size() == 1 && decoder_database_->IsComfortNoise( |
| 1421 | packet_list->front().payload_type))); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1422 | return 0; |
| 1423 | } |
| 1424 | |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1425 | void NetEqImpl::DoNormal(const int16_t* decoded_buffer, |
| 1426 | size_t decoded_length, |
| 1427 | AudioDecoder::SpeechType speech_type, |
| 1428 | bool play_dtmf) { |
henrik.lundin@webrtc.org | 40d3fc6 | 2013-09-18 12:19:50 +0000 | [diff] [blame] | 1429 | assert(normal_.get()); |
henrik.lundin@webrtc.org | 40d3fc6 | 2013-09-18 12:19:50 +0000 | [diff] [blame] | 1430 | normal_->Process(decoded_buffer, decoded_length, last_mode_, |
Henrik Lundin | 6dc82e8 | 2018-05-22 10:40:23 +0200 | [diff] [blame] | 1431 | algorithm_buffer_.get()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1432 | if (decoded_length != 0) { |
| 1433 | last_mode_ = kModeNormal; |
| 1434 | } |
| 1435 | |
| 1436 | // If last packet was decoded as an inband CNG, set mode to CNG instead. |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1437 | if ((speech_type == AudioDecoder::kComfortNoise) || |
| 1438 | ((last_mode_ == kModeCodecInternalCng) && (decoded_length == 0))) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1439 | // TODO(hlundin): Remove second part of || statement above. |
| 1440 | last_mode_ = kModeCodecInternalCng; |
| 1441 | } |
| 1442 | |
| 1443 | if (!play_dtmf) { |
| 1444 | dtmf_tone_generator_->Reset(); |
| 1445 | } |
| 1446 | } |
| 1447 | |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1448 | void NetEqImpl::DoMerge(int16_t* decoded_buffer, |
| 1449 | size_t decoded_length, |
| 1450 | AudioDecoder::SpeechType speech_type, |
| 1451 | bool play_dtmf) { |
henrik.lundin@webrtc.org | 40d3fc6 | 2013-09-18 12:19:50 +0000 | [diff] [blame] | 1452 | assert(merge_.get()); |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1453 | size_t new_length = |
| 1454 | merge_->Process(decoded_buffer, decoded_length, algorithm_buffer_.get()); |
henrik.lundin | 2979f55 | 2017-05-05 05:04:16 -0700 | [diff] [blame] | 1455 | // Correction can be negative. |
| 1456 | int expand_length_correction = |
| 1457 | rtc::dchecked_cast<int>(new_length) - |
| 1458 | rtc::dchecked_cast<int>(decoded_length / algorithm_buffer_->Channels()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1459 | |
| 1460 | // Update in-call and post-call statistics. |
| 1461 | if (expand_->MuteFactor(0) == 0) { |
| 1462 | // Expand generates only noise. |
henrik.lundin | 2979f55 | 2017-05-05 05:04:16 -0700 | [diff] [blame] | 1463 | stats_.ExpandedNoiseSamplesCorrection(expand_length_correction); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1464 | } else { |
| 1465 | // Expansion generates more than only noise. |
henrik.lundin | 2979f55 | 2017-05-05 05:04:16 -0700 | [diff] [blame] | 1466 | stats_.ExpandedVoiceSamplesCorrection(expand_length_correction); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1467 | } |
| 1468 | |
| 1469 | last_mode_ = kModeMerge; |
| 1470 | // If last packet was decoded as an inband CNG, set mode to CNG instead. |
| 1471 | if (speech_type == AudioDecoder::kComfortNoise) { |
| 1472 | last_mode_ = kModeCodecInternalCng; |
| 1473 | } |
| 1474 | expand_->Reset(); |
| 1475 | if (!play_dtmf) { |
| 1476 | dtmf_tone_generator_->Reset(); |
| 1477 | } |
| 1478 | } |
| 1479 | |
Henrik Lundin | 00eb12a | 2018-09-05 18:14:52 +0200 | [diff] [blame] | 1480 | bool NetEqImpl::DoCodecPlc() { |
| 1481 | AudioDecoder* decoder = decoder_database_->GetActiveDecoder(); |
| 1482 | if (!decoder) { |
| 1483 | return false; |
| 1484 | } |
| 1485 | const size_t channels = algorithm_buffer_->Channels(); |
| 1486 | const size_t requested_samples_per_channel = |
| 1487 | output_size_samples_ - |
| 1488 | (sync_buffer_->FutureLength() - expand_->overlap_length()); |
| 1489 | concealment_audio_.Clear(); |
| 1490 | decoder->GeneratePlc(requested_samples_per_channel, &concealment_audio_); |
| 1491 | if (concealment_audio_.empty()) { |
| 1492 | // Nothing produced. Resort to regular expand. |
| 1493 | return false; |
| 1494 | } |
| 1495 | RTC_CHECK_GE(concealment_audio_.size(), |
| 1496 | requested_samples_per_channel * channels); |
| 1497 | sync_buffer_->PushBackInterleaved(concealment_audio_); |
| 1498 | RTC_DCHECK_NE(algorithm_buffer_->Channels(), 0); |
| 1499 | const size_t concealed_samples_per_channel = |
| 1500 | concealment_audio_.size() / channels; |
| 1501 | |
| 1502 | // Update in-call and post-call statistics. |
| 1503 | const bool is_new_concealment_event = (last_mode_ != kModeCodecPlc); |
| 1504 | if (std::all_of(concealment_audio_.cbegin(), concealment_audio_.cend(), |
| 1505 | [](int16_t i) { return i == 0; })) { |
| 1506 | // Expand operation generates only noise. |
| 1507 | stats_.ExpandedNoiseSamples(concealed_samples_per_channel, |
| 1508 | is_new_concealment_event); |
| 1509 | } else { |
| 1510 | // Expand operation generates more than only noise. |
| 1511 | stats_.ExpandedVoiceSamples(concealed_samples_per_channel, |
| 1512 | is_new_concealment_event); |
| 1513 | } |
| 1514 | last_mode_ = kModeCodecPlc; |
| 1515 | if (!generated_noise_stopwatch_) { |
| 1516 | // Start a new stopwatch since we may be covering for a lost CNG packet. |
| 1517 | generated_noise_stopwatch_ = tick_timer_->GetNewStopwatch(); |
| 1518 | } |
| 1519 | return true; |
| 1520 | } |
| 1521 | |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1522 | int NetEqImpl::DoExpand(bool play_dtmf) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1523 | while ((sync_buffer_->FutureLength() - expand_->overlap_length()) < |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1524 | output_size_samples_) { |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1525 | algorithm_buffer_->Clear(); |
henrik.lundin@webrtc.org | 0d5da25 | 2013-09-18 21:12:38 +0000 | [diff] [blame] | 1526 | int return_value = expand_->Process(algorithm_buffer_.get()); |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1527 | size_t length = algorithm_buffer_->Size(); |
Gustaf Ullberg | 9a2e906 | 2017-09-18 09:28:20 +0200 | [diff] [blame] | 1528 | bool is_new_concealment_event = (last_mode_ != kModeExpand); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1529 | |
| 1530 | // Update in-call and post-call statistics. |
| 1531 | if (expand_->MuteFactor(0) == 0) { |
| 1532 | // Expand operation generates only noise. |
Gustaf Ullberg | 9a2e906 | 2017-09-18 09:28:20 +0200 | [diff] [blame] | 1533 | stats_.ExpandedNoiseSamples(length, is_new_concealment_event); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1534 | } else { |
| 1535 | // Expand operation generates more than only noise. |
Gustaf Ullberg | 9a2e906 | 2017-09-18 09:28:20 +0200 | [diff] [blame] | 1536 | stats_.ExpandedVoiceSamples(length, is_new_concealment_event); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1537 | } |
| 1538 | |
| 1539 | last_mode_ = kModeExpand; |
| 1540 | |
| 1541 | if (return_value < 0) { |
| 1542 | return return_value; |
| 1543 | } |
| 1544 | |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1545 | sync_buffer_->PushBack(*algorithm_buffer_); |
| 1546 | algorithm_buffer_->Clear(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1547 | } |
| 1548 | if (!play_dtmf) { |
| 1549 | dtmf_tone_generator_->Reset(); |
| 1550 | } |
henrik.lundin | b1fb72b | 2016-05-03 08:18:47 -0700 | [diff] [blame] | 1551 | |
| 1552 | if (!generated_noise_stopwatch_) { |
| 1553 | // Start a new stopwatch since we may be covering for a lost CNG packet. |
| 1554 | generated_noise_stopwatch_ = tick_timer_->GetNewStopwatch(); |
| 1555 | } |
| 1556 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1557 | return 0; |
| 1558 | } |
| 1559 | |
Henrik Lundin | cf808d2 | 2015-05-27 14:33:29 +0200 | [diff] [blame] | 1560 | int NetEqImpl::DoAccelerate(int16_t* decoded_buffer, |
| 1561 | size_t decoded_length, |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1562 | AudioDecoder::SpeechType speech_type, |
Henrik Lundin | cf808d2 | 2015-05-27 14:33:29 +0200 | [diff] [blame] | 1563 | bool play_dtmf, |
| 1564 | bool fast_accelerate) { |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1565 | const size_t required_samples = |
| 1566 | static_cast<size_t>(240 * fs_mult_); // Must have 30 ms. |
turaj@webrtc.org | 362a55e | 2013-09-20 16:25:28 +0000 | [diff] [blame] | 1567 | size_t borrowed_samples_per_channel = 0; |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1568 | size_t num_channels = algorithm_buffer_->Channels(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1569 | size_t decoded_length_per_channel = decoded_length / num_channels; |
| 1570 | if (decoded_length_per_channel < required_samples) { |
| 1571 | // Must move data from the |sync_buffer_| in order to get 30 ms. |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1572 | borrowed_samples_per_channel = |
| 1573 | static_cast<int>(required_samples - decoded_length_per_channel); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1574 | memmove(&decoded_buffer[borrowed_samples_per_channel * num_channels], |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1575 | decoded_buffer, sizeof(int16_t) * decoded_length); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1576 | sync_buffer_->ReadInterleavedFromEnd(borrowed_samples_per_channel, |
| 1577 | decoded_buffer); |
| 1578 | decoded_length = required_samples * num_channels; |
| 1579 | } |
| 1580 | |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1581 | size_t samples_removed; |
Henrik Lundin | cf808d2 | 2015-05-27 14:33:29 +0200 | [diff] [blame] | 1582 | Accelerate::ReturnCodes return_code = |
| 1583 | accelerate_->Process(decoded_buffer, decoded_length, fast_accelerate, |
| 1584 | algorithm_buffer_.get(), &samples_removed); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1585 | stats_.AcceleratedSamples(samples_removed); |
| 1586 | switch (return_code) { |
| 1587 | case Accelerate::kSuccess: |
| 1588 | last_mode_ = kModeAccelerateSuccess; |
| 1589 | break; |
| 1590 | case Accelerate::kSuccessLowEnergy: |
| 1591 | last_mode_ = kModeAccelerateLowEnergy; |
| 1592 | break; |
| 1593 | case Accelerate::kNoStretch: |
| 1594 | last_mode_ = kModeAccelerateFail; |
| 1595 | break; |
| 1596 | case Accelerate::kError: |
| 1597 | // TODO(hlundin): Map to kModeError instead? |
| 1598 | last_mode_ = kModeAccelerateFail; |
| 1599 | return kAccelerateError; |
| 1600 | } |
| 1601 | |
| 1602 | if (borrowed_samples_per_channel > 0) { |
| 1603 | // Copy borrowed samples back to the |sync_buffer_|. |
turaj@webrtc.org | 362a55e | 2013-09-20 16:25:28 +0000 | [diff] [blame] | 1604 | size_t length = algorithm_buffer_->Size(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1605 | if (length < borrowed_samples_per_channel) { |
| 1606 | // This destroys the beginning of the buffer, but will not cause any |
| 1607 | // problems. |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1608 | sync_buffer_->ReplaceAtIndex( |
| 1609 | *algorithm_buffer_, |
| 1610 | sync_buffer_->Size() - borrowed_samples_per_channel); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1611 | sync_buffer_->PushFrontZeros(borrowed_samples_per_channel - length); |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1612 | algorithm_buffer_->PopFront(length); |
| 1613 | assert(algorithm_buffer_->Empty()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1614 | } else { |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1615 | sync_buffer_->ReplaceAtIndex( |
| 1616 | *algorithm_buffer_, borrowed_samples_per_channel, |
| 1617 | sync_buffer_->Size() - borrowed_samples_per_channel); |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1618 | algorithm_buffer_->PopFront(borrowed_samples_per_channel); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1619 | } |
| 1620 | } |
| 1621 | |
| 1622 | // If last packet was decoded as an inband CNG, set mode to CNG instead. |
| 1623 | if (speech_type == AudioDecoder::kComfortNoise) { |
| 1624 | last_mode_ = kModeCodecInternalCng; |
| 1625 | } |
| 1626 | if (!play_dtmf) { |
| 1627 | dtmf_tone_generator_->Reset(); |
| 1628 | } |
| 1629 | expand_->Reset(); |
| 1630 | return 0; |
| 1631 | } |
| 1632 | |
| 1633 | int NetEqImpl::DoPreemptiveExpand(int16_t* decoded_buffer, |
| 1634 | size_t decoded_length, |
| 1635 | AudioDecoder::SpeechType speech_type, |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1636 | bool play_dtmf) { |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1637 | const size_t required_samples = |
| 1638 | static_cast<size_t>(240 * fs_mult_); // Must have 30 ms. |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1639 | size_t num_channels = algorithm_buffer_->Channels(); |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1640 | size_t borrowed_samples_per_channel = 0; |
| 1641 | size_t old_borrowed_samples_per_channel = 0; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1642 | size_t decoded_length_per_channel = decoded_length / num_channels; |
| 1643 | if (decoded_length_per_channel < required_samples) { |
| 1644 | // Must move data from the |sync_buffer_| in order to get 30 ms. |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1645 | borrowed_samples_per_channel = |
| 1646 | required_samples - decoded_length_per_channel; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1647 | // Calculate how many of these were already played out. |
Peter Kasting | f045e4d | 2015-06-10 21:15:38 -0700 | [diff] [blame] | 1648 | old_borrowed_samples_per_channel = |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1649 | (borrowed_samples_per_channel > sync_buffer_->FutureLength()) |
| 1650 | ? (borrowed_samples_per_channel - sync_buffer_->FutureLength()) |
| 1651 | : 0; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1652 | memmove(&decoded_buffer[borrowed_samples_per_channel * num_channels], |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1653 | decoded_buffer, sizeof(int16_t) * decoded_length); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1654 | sync_buffer_->ReadInterleavedFromEnd(borrowed_samples_per_channel, |
| 1655 | decoded_buffer); |
| 1656 | decoded_length = required_samples * num_channels; |
| 1657 | } |
| 1658 | |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1659 | size_t samples_added; |
henrik.lundin@webrtc.org | 40d3fc6 | 2013-09-18 12:19:50 +0000 | [diff] [blame] | 1660 | PreemptiveExpand::ReturnCodes return_code = preemptive_expand_->Process( |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1661 | decoded_buffer, decoded_length, old_borrowed_samples_per_channel, |
henrik.lundin@webrtc.org | 0d5da25 | 2013-09-18 21:12:38 +0000 | [diff] [blame] | 1662 | algorithm_buffer_.get(), &samples_added); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1663 | stats_.PreemptiveExpandedSamples(samples_added); |
| 1664 | switch (return_code) { |
| 1665 | case PreemptiveExpand::kSuccess: |
| 1666 | last_mode_ = kModePreemptiveExpandSuccess; |
| 1667 | break; |
| 1668 | case PreemptiveExpand::kSuccessLowEnergy: |
| 1669 | last_mode_ = kModePreemptiveExpandLowEnergy; |
| 1670 | break; |
| 1671 | case PreemptiveExpand::kNoStretch: |
| 1672 | last_mode_ = kModePreemptiveExpandFail; |
| 1673 | break; |
| 1674 | case PreemptiveExpand::kError: |
| 1675 | // TODO(hlundin): Map to kModeError instead? |
| 1676 | last_mode_ = kModePreemptiveExpandFail; |
| 1677 | return kPreemptiveExpandError; |
| 1678 | } |
| 1679 | |
| 1680 | if (borrowed_samples_per_channel > 0) { |
| 1681 | // Copy borrowed samples back to the |sync_buffer_|. |
| 1682 | sync_buffer_->ReplaceAtIndex( |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1683 | *algorithm_buffer_, borrowed_samples_per_channel, |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1684 | sync_buffer_->Size() - borrowed_samples_per_channel); |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1685 | algorithm_buffer_->PopFront(borrowed_samples_per_channel); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1686 | } |
| 1687 | |
| 1688 | // If last packet was decoded as an inband CNG, set mode to CNG instead. |
| 1689 | if (speech_type == AudioDecoder::kComfortNoise) { |
| 1690 | last_mode_ = kModeCodecInternalCng; |
| 1691 | } |
| 1692 | if (!play_dtmf) { |
| 1693 | dtmf_tone_generator_->Reset(); |
| 1694 | } |
| 1695 | expand_->Reset(); |
| 1696 | return 0; |
| 1697 | } |
| 1698 | |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1699 | int NetEqImpl::DoRfc3389Cng(PacketList* packet_list, bool play_dtmf) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1700 | if (!packet_list->empty()) { |
| 1701 | // Must have exactly one SID frame at this point. |
| 1702 | assert(packet_list->size() == 1); |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 1703 | const Packet& packet = packet_list->front(); |
| 1704 | if (!decoder_database_->IsComfortNoise(packet.payload_type)) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1705 | RTC_LOG(LS_ERROR) << "Trying to decode non-CNG payload as CNG."; |
henrik.lundin@webrtc.org | 73deaad | 2013-01-31 13:32:51 +0000 | [diff] [blame] | 1706 | return kOtherError; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1707 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1708 | if (comfort_noise_->UpdateParameters(packet) == |
| 1709 | ComfortNoise::kInternalError) { |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1710 | algorithm_buffer_->Zeros(output_size_samples_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1711 | return -comfort_noise_->internal_error_code(); |
| 1712 | } |
| 1713 | } |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1714 | int cn_return = |
| 1715 | comfort_noise_->Generate(output_size_samples_, algorithm_buffer_.get()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1716 | expand_->Reset(); |
| 1717 | last_mode_ = kModeRfc3389Cng; |
| 1718 | if (!play_dtmf) { |
| 1719 | dtmf_tone_generator_->Reset(); |
| 1720 | } |
| 1721 | if (cn_return == ComfortNoise::kInternalError) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1722 | RTC_LOG(LS_WARNING) << "Comfort noise generator returned error code: " |
| 1723 | << comfort_noise_->internal_error_code(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1724 | return kComfortNoiseErrorCode; |
| 1725 | } else if (cn_return == ComfortNoise::kUnknownPayloadType) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1726 | return kUnknownRtpPayloadType; |
| 1727 | } |
| 1728 | return 0; |
| 1729 | } |
| 1730 | |
minyuel | 6d92bf5 | 2015-09-23 15:20:39 +0200 | [diff] [blame] | 1731 | void NetEqImpl::DoCodecInternalCng(const int16_t* decoded_buffer, |
| 1732 | size_t decoded_length) { |
| 1733 | RTC_DCHECK(normal_.get()); |
minyuel | 6d92bf5 | 2015-09-23 15:20:39 +0200 | [diff] [blame] | 1734 | normal_->Process(decoded_buffer, decoded_length, last_mode_, |
Henrik Lundin | 6dc82e8 | 2018-05-22 10:40:23 +0200 | [diff] [blame] | 1735 | algorithm_buffer_.get()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1736 | last_mode_ = kModeCodecInternalCng; |
| 1737 | expand_->Reset(); |
| 1738 | } |
| 1739 | |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1740 | int NetEqImpl::DoDtmf(const DtmfEvent& dtmf_event, bool* play_dtmf) { |
turaj@webrtc.org | 4d06db5 | 2013-03-27 18:31:42 +0000 | [diff] [blame] | 1741 | // This block of the code and the block further down, handling |dtmf_switch| |
| 1742 | // are commented out. Otherwise playing out-of-band DTMF would fail in VoE |
| 1743 | // test, DtmfTest.ManualSuccessfullySendsOutOfBandTelephoneEvents. This is |
| 1744 | // equivalent to |dtmf_switch| always be false. |
| 1745 | // |
| 1746 | // See http://webrtc-codereview.appspot.com/1195004/ for discussion |
| 1747 | // On this issue. This change might cause some glitches at the point of |
| 1748 | // switch from audio to DTMF. Issue 1545 is filed to track this. |
| 1749 | // |
| 1750 | // bool dtmf_switch = false; |
| 1751 | // if ((last_mode_ != kModeDtmf) && dtmf_tone_generator_->initialized()) { |
| 1752 | // // Special case; see below. |
| 1753 | // // We must catch this before calling Generate, since |initialized| is |
| 1754 | // // modified in that call. |
| 1755 | // dtmf_switch = true; |
| 1756 | // } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1757 | |
| 1758 | int dtmf_return_value = 0; |
| 1759 | if (!dtmf_tone_generator_->initialized()) { |
| 1760 | // Initialize if not already done. |
| 1761 | dtmf_return_value = dtmf_tone_generator_->Init(fs_hz_, dtmf_event.event_no, |
| 1762 | dtmf_event.volume); |
| 1763 | } |
turaj@webrtc.org | 4d06db5 | 2013-03-27 18:31:42 +0000 | [diff] [blame] | 1764 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1765 | if (dtmf_return_value == 0) { |
| 1766 | // Generate DTMF signal. |
| 1767 | dtmf_return_value = dtmf_tone_generator_->Generate(output_size_samples_, |
henrik.lundin@webrtc.org | 0d5da25 | 2013-09-18 21:12:38 +0000 | [diff] [blame] | 1768 | algorithm_buffer_.get()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1769 | } |
turaj@webrtc.org | 4d06db5 | 2013-03-27 18:31:42 +0000 | [diff] [blame] | 1770 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1771 | if (dtmf_return_value < 0) { |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1772 | algorithm_buffer_->Zeros(output_size_samples_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1773 | return dtmf_return_value; |
| 1774 | } |
| 1775 | |
turaj@webrtc.org | 4d06db5 | 2013-03-27 18:31:42 +0000 | [diff] [blame] | 1776 | // if (dtmf_switch) { |
| 1777 | // // This is the special case where the previous operation was DTMF |
| 1778 | // // overdub, but the current instruction is "regular" DTMF. We must make |
| 1779 | // // sure that the DTMF does not have any discontinuities. The first DTMF |
| 1780 | // // sample that we generate now must be played out immediately, therefore |
| 1781 | // // it must be copied to the speech buffer. |
| 1782 | // // TODO(hlundin): This code seems incorrect. (Legacy.) Write test and |
| 1783 | // // verify correct operation. |
| 1784 | // assert(false); |
| 1785 | // // Must generate enough data to replace all of the |sync_buffer_| |
| 1786 | // // "future". |
| 1787 | // int required_length = sync_buffer_->FutureLength(); |
| 1788 | // assert(dtmf_tone_generator_->initialized()); |
| 1789 | // dtmf_return_value = dtmf_tone_generator_->Generate(required_length, |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1790 | // algorithm_buffer_); |
| 1791 | // assert((size_t) required_length == algorithm_buffer_->Size()); |
turaj@webrtc.org | 4d06db5 | 2013-03-27 18:31:42 +0000 | [diff] [blame] | 1792 | // if (dtmf_return_value < 0) { |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1793 | // algorithm_buffer_->Zeros(output_size_samples_); |
turaj@webrtc.org | 4d06db5 | 2013-03-27 18:31:42 +0000 | [diff] [blame] | 1794 | // return dtmf_return_value; |
| 1795 | // } |
| 1796 | // |
| 1797 | // // Overwrite the "future" part of the speech buffer with the new DTMF |
| 1798 | // // data. |
| 1799 | // // TODO(hlundin): It seems that this overwriting has gone lost. |
| 1800 | // // Not adapted for multi-channel yet. |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1801 | // assert(algorithm_buffer_->Channels() == 1); |
| 1802 | // if (algorithm_buffer_->Channels() != 1) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1803 | // RTC_LOG(LS_WARNING) << "DTMF not supported for more than one channel"; |
turaj@webrtc.org | 4d06db5 | 2013-03-27 18:31:42 +0000 | [diff] [blame] | 1804 | // return kStereoNotSupported; |
| 1805 | // } |
| 1806 | // // Shuffle the remaining data to the beginning of algorithm buffer. |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1807 | // algorithm_buffer_->PopFront(sync_buffer_->FutureLength()); |
turaj@webrtc.org | 4d06db5 | 2013-03-27 18:31:42 +0000 | [diff] [blame] | 1808 | // } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1809 | |
Peter Kasting | b7e5054 | 2015-06-11 12:55:50 -0700 | [diff] [blame] | 1810 | sync_buffer_->IncreaseEndTimestamp( |
| 1811 | static_cast<uint32_t>(output_size_samples_)); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1812 | expand_->Reset(); |
| 1813 | last_mode_ = kModeDtmf; |
| 1814 | |
| 1815 | // Set to false because the DTMF is already in the algorithm buffer. |
| 1816 | *play_dtmf = false; |
| 1817 | return 0; |
| 1818 | } |
| 1819 | |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1820 | int NetEqImpl::DtmfOverdub(const DtmfEvent& dtmf_event, |
| 1821 | size_t num_channels, |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1822 | int16_t* output) const { |
| 1823 | size_t out_index = 0; |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1824 | size_t overdub_length = output_size_samples_; // Default value. |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1825 | |
| 1826 | if (sync_buffer_->dtmf_index() > sync_buffer_->next_index()) { |
| 1827 | // Special operation for transition from "DTMF only" to "DTMF overdub". |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1828 | out_index = |
| 1829 | std::min(sync_buffer_->dtmf_index() - sync_buffer_->next_index(), |
| 1830 | output_size_samples_); |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1831 | overdub_length = output_size_samples_ - out_index; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1832 | } |
| 1833 | |
henrik.lundin@webrtc.org | fd11bbf | 2013-09-30 20:38:44 +0000 | [diff] [blame] | 1834 | AudioMultiVector dtmf_output(num_channels); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1835 | int dtmf_return_value = 0; |
| 1836 | if (!dtmf_tone_generator_->initialized()) { |
| 1837 | dtmf_return_value = dtmf_tone_generator_->Init(fs_hz_, dtmf_event.event_no, |
| 1838 | dtmf_event.volume); |
| 1839 | } |
| 1840 | if (dtmf_return_value == 0) { |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1841 | dtmf_return_value = |
| 1842 | dtmf_tone_generator_->Generate(overdub_length, &dtmf_output); |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1843 | assert(overdub_length == dtmf_output.Size()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1844 | } |
| 1845 | dtmf_output.ReadInterleaved(overdub_length, &output[out_index]); |
| 1846 | return dtmf_return_value < 0 ? dtmf_return_value : 0; |
| 1847 | } |
| 1848 | |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1849 | int NetEqImpl::ExtractPackets(size_t required_samples, |
| 1850 | PacketList* packet_list) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1851 | bool first_packet = true; |
| 1852 | uint8_t prev_payload_type = 0; |
| 1853 | uint32_t prev_timestamp = 0; |
| 1854 | uint16_t prev_sequence_number = 0; |
| 1855 | bool next_packet_available = false; |
| 1856 | |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1857 | const Packet* next_packet = packet_buffer_->PeekNextPacket(); |
| 1858 | RTC_DCHECK(next_packet); |
| 1859 | if (!next_packet) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1860 | RTC_LOG(LS_ERROR) << "Packet buffer unexpectedly empty."; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1861 | return -1; |
| 1862 | } |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1863 | uint32_t first_timestamp = next_packet->timestamp; |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 1864 | size_t extracted_samples = 0; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1865 | |
| 1866 | // Packet extraction loop. |
| 1867 | do { |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1868 | timestamp_ = next_packet->timestamp; |
Danil Chapovalov | b602123 | 2018-06-19 13:26:36 +0200 | [diff] [blame] | 1869 | absl::optional<Packet> packet = packet_buffer_->GetNextPacket(); |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1870 | // |next_packet| may be invalid after the |packet_buffer_| operation. |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 1871 | next_packet = nullptr; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1872 | if (!packet) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1873 | RTC_LOG(LS_ERROR) << "Should always be able to extract a packet here"; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1874 | assert(false); // Should always be able to extract a packet here. |
| 1875 | return -1; |
| 1876 | } |
Gustaf Ullberg | b0a0207 | 2017-10-02 12:00:34 +0200 | [diff] [blame] | 1877 | const uint64_t waiting_time_ms = packet->waiting_time->ElapsedMs(); |
| 1878 | stats_.StoreWaitingTime(waiting_time_ms); |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 1879 | RTC_DCHECK(!packet->empty()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1880 | |
| 1881 | if (first_packet) { |
| 1882 | first_packet = false; |
henrik.lundin | 48ed930 | 2015-10-29 05:36:24 -0700 | [diff] [blame] | 1883 | if (nack_enabled_) { |
| 1884 | RTC_DCHECK(nack_); |
| 1885 | // TODO(henrik.lundin): Should we update this for all decoded packets? |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1886 | nack_->UpdateLastDecodedPacket(packet->sequence_number, |
| 1887 | packet->timestamp); |
henrik.lundin | 48ed930 | 2015-10-29 05:36:24 -0700 | [diff] [blame] | 1888 | } |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1889 | prev_sequence_number = packet->sequence_number; |
| 1890 | prev_timestamp = packet->timestamp; |
| 1891 | prev_payload_type = packet->payload_type; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1892 | } |
| 1893 | |
ossu | cafb497 | 2017-01-02 07:00:50 -0800 | [diff] [blame] | 1894 | const bool has_cng_packet = |
| 1895 | decoder_database_->IsComfortNoise(packet->payload_type); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1896 | // Store number of extracted samples. |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 1897 | size_t packet_duration = 0; |
| 1898 | if (packet->frame) { |
| 1899 | packet_duration = packet->frame->Duration(); |
ossu | a70695a | 2016-09-22 02:06:28 -0700 | [diff] [blame] | 1900 | // TODO(ossu): Is this the correct way to track Opus FEC packets? |
| 1901 | if (packet->priority.codec_level > 0) { |
kwiberg | d3edd77 | 2017-03-01 18:52:48 -0800 | [diff] [blame] | 1902 | stats_.SecondaryDecodedSamples( |
| 1903 | rtc::dchecked_cast<int>(packet_duration)); |
minyue@webrtc.org | b28bfa7 | 2014-03-21 12:07:40 +0000 | [diff] [blame] | 1904 | } |
ossu | cafb497 | 2017-01-02 07:00:50 -0800 | [diff] [blame] | 1905 | } else if (!has_cng_packet) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1906 | RTC_LOG(LS_WARNING) << "Unknown payload type " |
| 1907 | << static_cast<int>(packet->payload_type); |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 1908 | RTC_NOTREACHED(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1909 | } |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 1910 | |
| 1911 | if (packet_duration == 0) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1912 | // Decoder did not return a packet duration. Assume that the packet |
| 1913 | // contains the same number of samples as the previous one. |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 1914 | packet_duration = decoder_frame_length_; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1915 | } |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1916 | extracted_samples = packet->timestamp - first_timestamp + packet_duration; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1917 | |
Gustaf Ullberg | b0a0207 | 2017-10-02 12:00:34 +0200 | [diff] [blame] | 1918 | stats_.JitterBufferDelay(extracted_samples, waiting_time_ms); |
| 1919 | |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 1920 | packet_list->push_back(std::move(*packet)); // Store packet in list. |
Danil Chapovalov | b602123 | 2018-06-19 13:26:36 +0200 | [diff] [blame] | 1921 | packet = absl::nullopt; // Ensure it's never used after the move. |
ossu | a73f6c9 | 2016-10-24 08:25:28 -0700 | [diff] [blame] | 1922 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1923 | // Check what packet is available next. |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1924 | next_packet = packet_buffer_->PeekNextPacket(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1925 | next_packet_available = false; |
ossu | cafb497 | 2017-01-02 07:00:50 -0800 | [diff] [blame] | 1926 | if (next_packet && prev_payload_type == next_packet->payload_type && |
| 1927 | !has_cng_packet) { |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1928 | int16_t seq_no_diff = next_packet->sequence_number - prev_sequence_number; |
| 1929 | size_t ts_diff = next_packet->timestamp - prev_timestamp; |
Jakob Ivarsson | 00a6ab5 | 2019-01-09 16:35:07 +0100 | [diff] [blame] | 1930 | if ((seq_no_diff == 1 || seq_no_diff == 0) && |
| 1931 | ts_diff <= packet_duration) { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1932 | // The next sequence number is available, or the next part of a packet |
| 1933 | // that was split into pieces upon insertion. |
| 1934 | next_packet_available = true; |
| 1935 | } |
ossu | 7a37761 | 2016-10-18 04:06:13 -0700 | [diff] [blame] | 1936 | prev_sequence_number = next_packet->sequence_number; |
Jakob Ivarsson | 00a6ab5 | 2019-01-09 16:35:07 +0100 | [diff] [blame] | 1937 | prev_timestamp = next_packet->timestamp; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1938 | } |
ossu | 61a208b | 2016-09-20 01:38:00 -0700 | [diff] [blame] | 1939 | } while (extracted_samples < required_samples && next_packet_available); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1940 | |
henrik.lundin@webrtc.org | 6121715 | 2014-09-22 08:30:07 +0000 | [diff] [blame] | 1941 | if (extracted_samples > 0) { |
| 1942 | // Delete old packets only when we are going to decode something. Otherwise, |
| 1943 | // we could end up in the situation where we never decode anything, since |
| 1944 | // all incoming packets are considered too old but the buffer will also |
| 1945 | // never be flooded and flushed. |
minyue-webrtc | fae474c | 2017-07-05 11:17:40 +0200 | [diff] [blame] | 1946 | packet_buffer_->DiscardAllOldPackets(timestamp_, &stats_); |
henrik.lundin@webrtc.org | 6121715 | 2014-09-22 08:30:07 +0000 | [diff] [blame] | 1947 | } |
| 1948 | |
kwiberg | d3edd77 | 2017-03-01 18:52:48 -0800 | [diff] [blame] | 1949 | return rtc::dchecked_cast<int>(extracted_samples); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1950 | } |
| 1951 | |
turaj@webrtc.org | 8d1cdaa | 2014-04-11 18:47:55 +0000 | [diff] [blame] | 1952 | void NetEqImpl::UpdatePlcComponents(int fs_hz, size_t channels) { |
| 1953 | // Delete objects and create new ones. |
| 1954 | expand_.reset(expand_factory_->Create(background_noise_.get(), |
| 1955 | sync_buffer_.get(), &random_vector_, |
Henrik Lundin | bef77e2 | 2015-08-18 14:58:09 +0200 | [diff] [blame] | 1956 | &stats_, fs_hz, channels)); |
turaj@webrtc.org | 8d1cdaa | 2014-04-11 18:47:55 +0000 | [diff] [blame] | 1957 | merge_.reset(new Merge(fs_hz, channels, expand_.get(), sync_buffer_.get())); |
| 1958 | } |
| 1959 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1960 | void NetEqImpl::SetSampleRateAndChannels(int fs_hz, size_t channels) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 1961 | RTC_LOG(LS_VERBOSE) << "SetSampleRateAndChannels " << fs_hz << " " |
| 1962 | << channels; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1963 | // TODO(hlundin): Change to an enumerator and skip assert. |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1964 | assert(fs_hz == 8000 || fs_hz == 16000 || fs_hz == 32000 || fs_hz == 48000); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1965 | assert(channels > 0); |
| 1966 | |
| 1967 | fs_hz_ = fs_hz; |
| 1968 | fs_mult_ = fs_hz / 8000; |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 1969 | output_size_samples_ = static_cast<size_t>(kOutputSizeMs * 8 * fs_mult_); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1970 | decoder_frame_length_ = 3 * output_size_samples_; // Initialize to 30ms. |
| 1971 | |
| 1972 | last_mode_ = kModeNormal; |
| 1973 | |
ossu | 97ba30e | 2016-04-25 07:55:58 -0700 | [diff] [blame] | 1974 | ComfortNoiseDecoder* cng_decoder = decoder_database_->GetActiveCngDecoder(); |
Karl Wiberg | 4376648 | 2015-08-27 15:22:11 +0200 | [diff] [blame] | 1975 | if (cng_decoder) |
| 1976 | cng_decoder->Reset(); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1977 | |
| 1978 | // Reinit post-decode VAD with new sample rate. |
| 1979 | assert(vad_.get()); // Cannot be NULL here. |
| 1980 | vad_->Init(); |
| 1981 | |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1982 | // Delete algorithm buffer and create a new one. |
henrik.lundin@webrtc.org | fd11bbf | 2013-09-30 20:38:44 +0000 | [diff] [blame] | 1983 | algorithm_buffer_.reset(new AudioMultiVector(channels)); |
henrik.lundin@webrtc.org | c487c6a | 2013-09-02 07:59:30 +0000 | [diff] [blame] | 1984 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1985 | // Delete sync buffer and create a new one. |
henrik.lundin@webrtc.org | 0d5da25 | 2013-09-18 21:12:38 +0000 | [diff] [blame] | 1986 | sync_buffer_.reset(new SyncBuffer(channels, kSyncBufferSize * fs_mult_)); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1987 | |
henrik.lundin@webrtc.org | ea25784 | 2014-08-07 12:27:37 +0000 | [diff] [blame] | 1988 | // Delete BackgroundNoise object and create a new one. |
henrik.lundin@webrtc.org | 0d5da25 | 2013-09-18 21:12:38 +0000 | [diff] [blame] | 1989 | background_noise_.reset(new BackgroundNoise(channels)); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1990 | |
| 1991 | // Reset random vector. |
| 1992 | random_vector_.Reset(); |
| 1993 | |
turaj@webrtc.org | 8d1cdaa | 2014-04-11 18:47:55 +0000 | [diff] [blame] | 1994 | UpdatePlcComponents(fs_hz, channels); |
| 1995 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1996 | // Move index so that we create a small set of future samples (all 0). |
| 1997 | sync_buffer_->set_next_index(sync_buffer_->next_index() - |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 1998 | expand_->overlap_length()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 1999 | |
henrik.lundin@webrtc.org | 40d3fc6 | 2013-09-18 12:19:50 +0000 | [diff] [blame] | 2000 | normal_.reset(new Normal(fs_hz, decoder_database_.get(), *background_noise_, |
henrik.lundin@webrtc.org | 0d5da25 | 2013-09-18 21:12:38 +0000 | [diff] [blame] | 2001 | expand_.get())); |
henrik.lundin@webrtc.org | d9faa46 | 2014-01-14 10:18:45 +0000 | [diff] [blame] | 2002 | accelerate_.reset( |
| 2003 | accelerate_factory_->Create(fs_hz, channels, *background_noise_)); |
turaj@webrtc.org | 8d1cdaa | 2014-04-11 18:47:55 +0000 | [diff] [blame] | 2004 | preemptive_expand_.reset(preemptive_expand_factory_->Create( |
Peter Kasting | dce40cf | 2015-08-24 14:52:23 -0700 | [diff] [blame] | 2005 | fs_hz, channels, *background_noise_, expand_->overlap_length())); |
henrik.lundin@webrtc.org | 40d3fc6 | 2013-09-18 12:19:50 +0000 | [diff] [blame] | 2006 | |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 2007 | // Delete ComfortNoise object and create a new one. |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 2008 | comfort_noise_.reset( |
| 2009 | new ComfortNoise(fs_hz, decoder_database_.get(), sync_buffer_.get())); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 2010 | |
| 2011 | // Verify that |decoded_buffer_| is long enough. |
| 2012 | if (decoded_buffer_length_ < kMaxFrameSize * channels) { |
| 2013 | // Reallocate to larger size. |
| 2014 | decoded_buffer_length_ = kMaxFrameSize * channels; |
| 2015 | decoded_buffer_.reset(new int16_t[decoded_buffer_length_]); |
| 2016 | } |
| 2017 | |
turaj@webrtc.org | 8d1cdaa | 2014-04-11 18:47:55 +0000 | [diff] [blame] | 2018 | // Create DecisionLogic if it is not created yet, then communicate new sample |
| 2019 | // rate and output size to DecisionLogic object. |
| 2020 | if (!decision_logic_.get()) { |
henrik.lundin@webrtc.org | 7cbc4f9 | 2014-10-07 06:37:39 +0000 | [diff] [blame] | 2021 | CreateDecisionLogic(); |
turaj@webrtc.org | 8d1cdaa | 2014-04-11 18:47:55 +0000 | [diff] [blame] | 2022 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 2023 | decision_logic_->SetSampleRate(fs_hz_, output_size_samples_); |
| 2024 | } |
| 2025 | |
henrik.lundin | 55480f5 | 2016-03-08 02:37:57 -0800 | [diff] [blame] | 2026 | NetEqImpl::OutputType NetEqImpl::LastOutputType() { |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 2027 | assert(vad_.get()); |
henrik.lundin@webrtc.org | 0d5da25 | 2013-09-18 21:12:38 +0000 | [diff] [blame] | 2028 | assert(expand_.get()); |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 2029 | if (last_mode_ == kModeCodecInternalCng || last_mode_ == kModeRfc3389Cng) { |
henrik.lundin | 55480f5 | 2016-03-08 02:37:57 -0800 | [diff] [blame] | 2030 | return OutputType::kCNG; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 2031 | } else if (last_mode_ == kModeExpand && expand_->MuteFactor(0) == 0) { |
| 2032 | // Expand mode has faded down to background noise only (very long expand). |
henrik.lundin | 55480f5 | 2016-03-08 02:37:57 -0800 | [diff] [blame] | 2033 | return OutputType::kPLCCNG; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 2034 | } else if (last_mode_ == kModeExpand) { |
henrik.lundin | 55480f5 | 2016-03-08 02:37:57 -0800 | [diff] [blame] | 2035 | return OutputType::kPLC; |
wu@webrtc.org | 24301a6 | 2013-12-13 19:17:43 +0000 | [diff] [blame] | 2036 | } else if (vad_->running() && !vad_->active_speech()) { |
henrik.lundin | 55480f5 | 2016-03-08 02:37:57 -0800 | [diff] [blame] | 2037 | return OutputType::kVadPassive; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 2038 | } else { |
henrik.lundin | 55480f5 | 2016-03-08 02:37:57 -0800 | [diff] [blame] | 2039 | return OutputType::kNormalSpeech; |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 2040 | } |
| 2041 | } |
| 2042 | |
henrik.lundin@webrtc.org | 7cbc4f9 | 2014-10-07 06:37:39 +0000 | [diff] [blame] | 2043 | void NetEqImpl::CreateDecisionLogic() { |
Henrik Lundin | 47b17dc | 2016-05-10 10:20:59 +0200 | [diff] [blame] | 2044 | decision_logic_.reset(DecisionLogic::Create( |
Henrik Lundin | 7687ad5 | 2018-07-02 10:14:46 +0200 | [diff] [blame] | 2045 | fs_hz_, output_size_samples_, no_time_stretching_, |
| 2046 | decoder_database_.get(), *packet_buffer_.get(), delay_manager_.get(), |
| 2047 | buffer_level_filter_.get(), tick_timer_.get())); |
turaj@webrtc.org | 8d1cdaa | 2014-04-11 18:47:55 +0000 | [diff] [blame] | 2048 | } |
henrik.lundin@webrtc.org | d94659d | 2013-01-29 12:09:21 +0000 | [diff] [blame] | 2049 | } // namespace webrtc |