cf808d2366
This change instroduces a mode where the Accelerate operation will be more aggressive. When enabled, it will allow acceleration at lower correlation levels, and possibly remove multiple pitch periods at once. The feature is enabled through NetEq::Config, and is off by default. This means that bit-exactness tests are currently not affected. A unit test was added for the Accelerate class, with and without fast mode enabled. BUG=4691 R=minyue@webrtc.org Review URL: https://webrtc-codereview.appspot.com/50039004 Cr-Commit-Position: refs/heads/master@{#9295}
76 lines
3.3 KiB
C++
76 lines
3.3 KiB
C++
/*
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
|
|
|
|
#include <sstream>
|
|
|
|
#include "webrtc/modules/audio_coding/neteq/accelerate.h"
|
|
#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
|
|
#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
|
|
#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
|
|
#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h"
|
|
#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h"
|
|
#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h"
|
|
#include "webrtc/modules/audio_coding/neteq/expand.h"
|
|
#include "webrtc/modules/audio_coding/neteq/neteq_impl.h"
|
|
#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
|
|
#include "webrtc/modules/audio_coding/neteq/payload_splitter.h"
|
|
#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h"
|
|
#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h"
|
|
|
|
namespace webrtc {
|
|
|
|
std::string NetEq::Config::ToString() const {
|
|
std::stringstream ss;
|
|
ss << "sample_rate_hz=" << sample_rate_hz << ", enable_audio_classifier="
|
|
<< (enable_audio_classifier ? "true" : "false")
|
|
<< ", max_packets_in_buffer=" << max_packets_in_buffer
|
|
<< ", background_noise_mode=" << background_noise_mode
|
|
<< ", playout_mode=" << playout_mode
|
|
<< ", enable_fast_accelerate=" << enable_fast_accelerate;
|
|
return ss.str();
|
|
}
|
|
|
|
// Creates all classes needed and inject them into a new NetEqImpl object.
|
|
// Return the new object.
|
|
NetEq* NetEq::Create(const NetEq::Config& config) {
|
|
BufferLevelFilter* buffer_level_filter = new BufferLevelFilter;
|
|
DecoderDatabase* decoder_database = new DecoderDatabase;
|
|
DelayPeakDetector* delay_peak_detector = new DelayPeakDetector;
|
|
DelayManager* delay_manager =
|
|
new DelayManager(config.max_packets_in_buffer, delay_peak_detector);
|
|
delay_manager->SetMaximumDelay(config.max_delay_ms);
|
|
DtmfBuffer* dtmf_buffer = new DtmfBuffer(config.sample_rate_hz);
|
|
DtmfToneGenerator* dtmf_tone_generator = new DtmfToneGenerator;
|
|
PacketBuffer* packet_buffer = new PacketBuffer(config.max_packets_in_buffer);
|
|
PayloadSplitter* payload_splitter = new PayloadSplitter;
|
|
TimestampScaler* timestamp_scaler = new TimestampScaler(*decoder_database);
|
|
AccelerateFactory* accelerate_factory = new AccelerateFactory;
|
|
ExpandFactory* expand_factory = new ExpandFactory;
|
|
PreemptiveExpandFactory* preemptive_expand_factory =
|
|
new PreemptiveExpandFactory;
|
|
return new NetEqImpl(config,
|
|
buffer_level_filter,
|
|
decoder_database,
|
|
delay_manager,
|
|
delay_peak_detector,
|
|
dtmf_buffer,
|
|
dtmf_tone_generator,
|
|
packet_buffer,
|
|
payload_splitter,
|
|
timestamp_scaler,
|
|
accelerate_factory,
|
|
expand_factory,
|
|
preemptive_expand_factory);
|
|
}
|
|
|
|
} // namespace webrtc
|