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}
This commit is contained in:
@ -21,6 +21,9 @@
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
// static
|
||||
const size_t BackgroundNoise::kMaxLpcOrder;
|
||||
|
||||
BackgroundNoise::BackgroundNoise(size_t num_channels)
|
||||
: num_channels_(num_channels),
|
||||
channel_parameters_(new ChannelParameters[num_channels_]),
|
||||
@ -150,7 +153,7 @@ const int16_t* BackgroundNoise::FilterState(size_t channel) const {
|
||||
void BackgroundNoise::SetFilterState(size_t channel, const int16_t* input,
|
||||
size_t length) {
|
||||
assert(channel < num_channels_);
|
||||
length = std::min(length, static_cast<size_t>(kMaxLpcOrder));
|
||||
length = std::min(length, kMaxLpcOrder);
|
||||
memcpy(channel_parameters_[channel].filter_state, input,
|
||||
length * sizeof(int16_t));
|
||||
}
|
||||
@ -165,7 +168,7 @@ int16_t BackgroundNoise::ScaleShift(size_t channel) const {
|
||||
}
|
||||
|
||||
int32_t BackgroundNoise::CalculateAutoCorrelation(
|
||||
const int16_t* signal, int length, int32_t* auto_correlation) const {
|
||||
const int16_t* signal, size_t length, int32_t* auto_correlation) const {
|
||||
int16_t signal_max = WebRtcSpl_MaxAbsValueW16(signal, length);
|
||||
int correlation_scale = kLogVecLen -
|
||||
WebRtcSpl_NormW32(signal_max * signal_max);
|
||||
@ -247,7 +250,7 @@ void BackgroundNoise::SaveParameters(size_t channel,
|
||||
residual_energy = residual_energy << norm_shift;
|
||||
|
||||
// Calculate scale and shift factor.
|
||||
parameters.scale = WebRtcSpl_SqrtFloor(residual_energy);
|
||||
parameters.scale = static_cast<int16_t>(WebRtcSpl_SqrtFloor(residual_energy));
|
||||
// Add 13 to the |scale_shift_|, since the random numbers table is in
|
||||
// Q13.
|
||||
// TODO(hlundin): Move the "13" to where the |scale_shift_| is used?
|
||||
|
||||
Reference in New Issue
Block a user