533c225c93
This reverts commit 67e43c8b95057a889ba9946e47d50a265e1e9ac9. Reason for revert: speculative revert since we see failing bots on Android after this change https://ci.chromium.org/p/chromium/builders/webrtc.fyi/WebRTC%20Chromium%20FYI%20Android%20Tests%20%28dbg%29%20%28K%20Nexus5%29/4124 Original change's description: > Correct conversion between float and fixed formats > > This CL changes the way that values are converted > between fixed and floating point to > -Avoid the former asymmetric conversion causing > nonlinear distortions. > -Reduce the complexity. > > Bug: webrtc:6594 > Change-Id: I64d0cc31c5d16f397686a59a062cfbc4b336d94d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132783 > Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org> > Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org> > Commit-Queue: Per Åhgren <peah@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#28867} TBR=henrik.lundin@webrtc.org,gustaf@webrtc.org,peah@webrtc.org Change-Id: Id828a09de7075e48556fe2d0beba7a0c6ec227f6 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:6594 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/149165 Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Henrik Andreassson <henrika@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28872}
50 lines
1.6 KiB
C++
50 lines
1.6 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#include "common_audio/include/audio_util.h"
|
|
|
|
namespace webrtc {
|
|
|
|
void FloatToS16(const float* src, size_t size, int16_t* dest) {
|
|
for (size_t i = 0; i < size; ++i)
|
|
dest[i] = FloatToS16(src[i]);
|
|
}
|
|
|
|
void S16ToFloat(const int16_t* src, size_t size, float* dest) {
|
|
for (size_t i = 0; i < size; ++i)
|
|
dest[i] = S16ToFloat(src[i]);
|
|
}
|
|
|
|
void FloatS16ToS16(const float* src, size_t size, int16_t* dest) {
|
|
for (size_t i = 0; i < size; ++i)
|
|
dest[i] = FloatS16ToS16(src[i]);
|
|
}
|
|
|
|
void FloatToFloatS16(const float* src, size_t size, float* dest) {
|
|
for (size_t i = 0; i < size; ++i)
|
|
dest[i] = FloatToFloatS16(src[i]);
|
|
}
|
|
|
|
void FloatS16ToFloat(const float* src, size_t size, float* dest) {
|
|
for (size_t i = 0; i < size; ++i)
|
|
dest[i] = FloatS16ToFloat(src[i]);
|
|
}
|
|
|
|
template <>
|
|
void DownmixInterleavedToMono<int16_t>(const int16_t* interleaved,
|
|
size_t num_frames,
|
|
int num_channels,
|
|
int16_t* deinterleaved) {
|
|
DownmixInterleavedToMonoImpl<int16_t, int32_t>(interleaved, num_frames,
|
|
num_channels, deinterleaved);
|
|
}
|
|
|
|
} // namespace webrtc
|