Update to current webrtc library
This is from the upstream library commit id 3326535126e435f1ba647885ce43a8f0f3d317eb, corresponding to Chromium 88.0.4290.1.
This commit is contained in:
@ -8,18 +8,25 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "webrtc/common_audio/channel_buffer.h"
|
||||
#include "common_audio/channel_buffer.h"
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
#include "common_audio/include/audio_util.h"
|
||||
#include "rtc_base/checks.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
IFChannelBuffer::IFChannelBuffer(size_t num_frames,
|
||||
int num_channels,
|
||||
size_t num_channels,
|
||||
size_t num_bands)
|
||||
: ivalid_(true),
|
||||
ibuf_(num_frames, num_channels, num_bands),
|
||||
fvalid_(true),
|
||||
fbuf_(num_frames, num_channels, num_bands) {}
|
||||
|
||||
IFChannelBuffer::~IFChannelBuffer() = default;
|
||||
|
||||
ChannelBuffer<int16_t>* IFChannelBuffer::ibuf() {
|
||||
RefreshI();
|
||||
fvalid_ = false;
|
||||
@ -44,10 +51,11 @@ const ChannelBuffer<float>* IFChannelBuffer::fbuf_const() const {
|
||||
|
||||
void IFChannelBuffer::RefreshF() const {
|
||||
if (!fvalid_) {
|
||||
assert(ivalid_);
|
||||
RTC_DCHECK(ivalid_);
|
||||
fbuf_.set_num_channels(ibuf_.num_channels());
|
||||
const int16_t* const* int_channels = ibuf_.channels();
|
||||
float* const* float_channels = fbuf_.channels();
|
||||
for (int i = 0; i < ibuf_.num_channels(); ++i) {
|
||||
for (size_t i = 0; i < ibuf_.num_channels(); ++i) {
|
||||
for (size_t j = 0; j < ibuf_.num_frames(); ++j) {
|
||||
float_channels[i][j] = int_channels[i][j];
|
||||
}
|
||||
@ -58,13 +66,12 @@ void IFChannelBuffer::RefreshF() const {
|
||||
|
||||
void IFChannelBuffer::RefreshI() const {
|
||||
if (!ivalid_) {
|
||||
assert(fvalid_);
|
||||
RTC_DCHECK(fvalid_);
|
||||
int16_t* const* int_channels = ibuf_.channels();
|
||||
ibuf_.set_num_channels(fbuf_.num_channels());
|
||||
const float* const* float_channels = fbuf_.channels();
|
||||
for (int i = 0; i < ibuf_.num_channels(); ++i) {
|
||||
FloatS16ToS16(float_channels[i],
|
||||
ibuf_.num_frames(),
|
||||
int_channels[i]);
|
||||
for (size_t i = 0; i < fbuf_.num_channels(); ++i) {
|
||||
FloatS16ToS16(float_channels[i], ibuf_.num_frames(), int_channels[i]);
|
||||
}
|
||||
ivalid_ = true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user