2013-01-29 12:09:21 +00:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2013 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.
|
|
|
|
|
*/
|
|
|
|
|
|
2014-06-09 08:10:28 +00:00
|
|
|
#include "webrtc/modules/audio_coding/neteq/decision_logic.h"
|
2013-01-29 12:09:21 +00:00
|
|
|
|
|
|
|
|
#include <algorithm>
|
|
|
|
|
|
2014-06-09 08:10:28 +00:00
|
|
|
#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
|
|
|
|
|
#include "webrtc/modules/audio_coding/neteq/decision_logic_fax.h"
|
|
|
|
|
#include "webrtc/modules/audio_coding/neteq/decision_logic_normal.h"
|
|
|
|
|
#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
|
|
|
|
|
#include "webrtc/modules/audio_coding/neteq/expand.h"
|
|
|
|
|
#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
|
|
|
|
|
#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
|
2015-10-28 18:17:40 +01:00
|
|
|
#include "webrtc/system_wrappers/include/logging.h"
|
2013-01-29 12:09:21 +00:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
|
|
|
|
DecisionLogic* DecisionLogic::Create(int fs_hz,
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
size_t output_size_samples,
|
2013-01-29 12:09:21 +00:00
|
|
|
NetEqPlayoutMode playout_mode,
|
|
|
|
|
DecoderDatabase* decoder_database,
|
|
|
|
|
const PacketBuffer& packet_buffer,
|
|
|
|
|
DelayManager* delay_manager,
|
|
|
|
|
BufferLevelFilter* buffer_level_filter) {
|
|
|
|
|
switch (playout_mode) {
|
|
|
|
|
case kPlayoutOn:
|
|
|
|
|
case kPlayoutStreaming:
|
|
|
|
|
return new DecisionLogicNormal(fs_hz,
|
|
|
|
|
output_size_samples,
|
|
|
|
|
playout_mode,
|
|
|
|
|
decoder_database,
|
|
|
|
|
packet_buffer,
|
|
|
|
|
delay_manager,
|
|
|
|
|
buffer_level_filter);
|
|
|
|
|
case kPlayoutFax:
|
|
|
|
|
case kPlayoutOff:
|
|
|
|
|
return new DecisionLogicFax(fs_hz,
|
|
|
|
|
output_size_samples,
|
|
|
|
|
playout_mode,
|
|
|
|
|
decoder_database,
|
|
|
|
|
packet_buffer,
|
|
|
|
|
delay_manager,
|
|
|
|
|
buffer_level_filter);
|
|
|
|
|
}
|
|
|
|
|
// This line cannot be reached, but must be here to avoid compiler errors.
|
|
|
|
|
assert(false);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DecisionLogic::DecisionLogic(int fs_hz,
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
size_t output_size_samples,
|
2013-01-29 12:09:21 +00:00
|
|
|
NetEqPlayoutMode playout_mode,
|
|
|
|
|
DecoderDatabase* decoder_database,
|
|
|
|
|
const PacketBuffer& packet_buffer,
|
|
|
|
|
DelayManager* delay_manager,
|
|
|
|
|
BufferLevelFilter* buffer_level_filter)
|
|
|
|
|
: decoder_database_(decoder_database),
|
|
|
|
|
packet_buffer_(packet_buffer),
|
|
|
|
|
delay_manager_(delay_manager),
|
|
|
|
|
buffer_level_filter_(buffer_level_filter),
|
|
|
|
|
cng_state_(kCngOff),
|
|
|
|
|
packet_length_samples_(0),
|
|
|
|
|
sample_memory_(0),
|
|
|
|
|
prev_time_scale_(false),
|
|
|
|
|
timescale_hold_off_(kMinTimescaleInterval),
|
|
|
|
|
num_consecutive_expands_(0),
|
|
|
|
|
playout_mode_(playout_mode) {
|
|
|
|
|
delay_manager_->set_streaming_mode(playout_mode_ == kPlayoutStreaming);
|
|
|
|
|
SetSampleRate(fs_hz, output_size_samples);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void DecisionLogic::Reset() {
|
|
|
|
|
cng_state_ = kCngOff;
|
2016-05-03 08:18:47 -07:00
|
|
|
noise_fast_forward_ = 0;
|
2013-01-29 12:09:21 +00:00
|
|
|
packet_length_samples_ = 0;
|
|
|
|
|
sample_memory_ = 0;
|
|
|
|
|
prev_time_scale_ = false;
|
|
|
|
|
timescale_hold_off_ = 0;
|
|
|
|
|
num_consecutive_expands_ = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void DecisionLogic::SoftReset() {
|
|
|
|
|
packet_length_samples_ = 0;
|
|
|
|
|
sample_memory_ = 0;
|
|
|
|
|
prev_time_scale_ = false;
|
|
|
|
|
timescale_hold_off_ = kMinTimescaleInterval;
|
|
|
|
|
}
|
|
|
|
|
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
void DecisionLogic::SetSampleRate(int fs_hz, size_t output_size_samples) {
|
2013-01-29 12:09:21 +00:00
|
|
|
// TODO(hlundin): Change to an enumerator and skip assert.
|
|
|
|
|
assert(fs_hz == 8000 || fs_hz == 16000 || fs_hz == 32000 || fs_hz == 48000);
|
|
|
|
|
fs_mult_ = fs_hz / 8000;
|
|
|
|
|
output_size_samples_ = output_size_samples;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Operations DecisionLogic::GetDecision(const SyncBuffer& sync_buffer,
|
|
|
|
|
const Expand& expand,
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
size_t decoder_frame_length,
|
2013-01-29 12:09:21 +00:00
|
|
|
const RTPHeader* packet_header,
|
|
|
|
|
Modes prev_mode,
|
2016-05-03 08:18:47 -07:00
|
|
|
bool play_dtmf,
|
|
|
|
|
size_t generated_noise_samples,
|
|
|
|
|
bool* reset_decoder) {
|
2013-01-29 12:09:21 +00:00
|
|
|
if (prev_mode == kModeRfc3389Cng ||
|
|
|
|
|
prev_mode == kModeCodecInternalCng ||
|
|
|
|
|
prev_mode == kModeExpand) {
|
|
|
|
|
// If last mode was CNG (or Expand, since this could be covering up for
|
2016-05-03 08:18:47 -07:00
|
|
|
// a lost CNG packet), remember that CNG is on. This is needed if comfort
|
|
|
|
|
// noise is interrupted by DTMF.
|
2013-01-29 12:09:21 +00:00
|
|
|
if (prev_mode == kModeRfc3389Cng) {
|
|
|
|
|
cng_state_ = kCngRfc3389On;
|
|
|
|
|
} else if (prev_mode == kModeCodecInternalCng) {
|
|
|
|
|
cng_state_ = kCngInternalOn;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
const size_t samples_left =
|
|
|
|
|
sync_buffer.FutureLength() - expand.overlap_length();
|
|
|
|
|
const size_t cur_size_samples =
|
2013-01-29 12:09:21 +00:00
|
|
|
samples_left + packet_buffer_.NumSamplesInBuffer(decoder_database_,
|
|
|
|
|
decoder_frame_length);
|
|
|
|
|
|
|
|
|
|
prev_time_scale_ = prev_time_scale_ &&
|
|
|
|
|
(prev_mode == kModeAccelerateSuccess ||
|
|
|
|
|
prev_mode == kModeAccelerateLowEnergy ||
|
|
|
|
|
prev_mode == kModePreemptiveExpandSuccess ||
|
|
|
|
|
prev_mode == kModePreemptiveExpandLowEnergy);
|
|
|
|
|
|
|
|
|
|
FilterBufferLevel(cur_size_samples, prev_mode);
|
|
|
|
|
|
|
|
|
|
return GetDecisionSpecialized(sync_buffer, expand, decoder_frame_length,
|
|
|
|
|
packet_header, prev_mode, play_dtmf,
|
2016-05-03 08:18:47 -07:00
|
|
|
reset_decoder, generated_noise_samples);
|
2013-01-29 12:09:21 +00:00
|
|
|
}
|
|
|
|
|
|
2014-04-11 18:47:55 +00:00
|
|
|
void DecisionLogic::ExpandDecision(Operations operation) {
|
|
|
|
|
if (operation == kExpand) {
|
2013-01-29 12:09:21 +00:00
|
|
|
num_consecutive_expands_++;
|
|
|
|
|
} else {
|
|
|
|
|
num_consecutive_expands_ = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
void DecisionLogic::FilterBufferLevel(size_t buffer_size_samples,
|
2013-01-29 12:09:21 +00:00
|
|
|
Modes prev_mode) {
|
|
|
|
|
// Do not update buffer history if currently playing CNG since it will bias
|
|
|
|
|
// the filtered buffer level.
|
|
|
|
|
if ((prev_mode != kModeRfc3389Cng) && (prev_mode != kModeCodecInternalCng)) {
|
|
|
|
|
buffer_level_filter_->SetTargetBufferLevel(
|
|
|
|
|
delay_manager_->base_target_level());
|
|
|
|
|
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
size_t buffer_size_packets = 0;
|
2013-01-29 12:09:21 +00:00
|
|
|
if (packet_length_samples_ > 0) {
|
|
|
|
|
// Calculate size in packets.
|
|
|
|
|
buffer_size_packets = buffer_size_samples / packet_length_samples_;
|
|
|
|
|
}
|
|
|
|
|
int sample_memory_local = 0;
|
|
|
|
|
if (prev_time_scale_) {
|
|
|
|
|
sample_memory_local = sample_memory_;
|
|
|
|
|
timescale_hold_off_ = kMinTimescaleInterval;
|
|
|
|
|
}
|
|
|
|
|
buffer_level_filter_->Update(buffer_size_packets, sample_memory_local,
|
|
|
|
|
packet_length_samples_);
|
|
|
|
|
prev_time_scale_ = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
timescale_hold_off_ = std::max(timescale_hold_off_ - 1, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace webrtc
|