Reason for revert: Looks like the Chrome iOS build is broken because of these two changes. So I'm going to have to revert. Here's the error: https://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ninja/builds/185624/steps/compile/logs/stdio FAILED: rm -f arch/libsafe_numerics.arm64.a && ./gyp-mac-tool filter-libtool libtool -static -o arch/libsafe_numerics.arm64.a error: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool: no files specified Usage: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool -static [-] file [...] [-filelist listfile[,dirname]] [-arch_only arch] [-sacLT] [-no_warning_for_no_symbols] Usage: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool -dynamic [-] file [...] [-filelist listfile[,dirname]] [-arch_only arch] [-o output] [-install_name name] [-compatibility_version #] [-current_version #] [-seg1addr 0x#] [-segs_read_only_addr 0x#] [-segs_read_write_addr 0x#] [-seg_addr_table <filename>] [-seg_addr_table_filename <file_system_path>] [-all_load] [-noall_load] FAILED: rm -f arch/libsafe_numerics.armv7.a && ./gyp-mac-tool filter-libtool libtool -static -o arch/libsafe_numerics.armv7.a error: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool: no files specified Usage: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool -static [-] file [...] [-filelist listfile[,dirname]] [-arch_only arch] [-sacLT] [-no_warning_for_no_symbols] Usage: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool -dynamic [-] file [...] [-filelist listfile[,dirname]] [-arch_only arch] [-o output] [-install_name name] [-compatibility_version #] [-current_version #] [-seg1addr 0x#] [-segs_read_only_addr 0x#] [-segs_read_write_addr 0x#] [-seg_addr_table <filename>] [-seg_addr_table_filename <file_system_path>] [-all_load] [-noall_load] ninja: build stopped: subcommand failed. Original issue's description: > Safe numeric library added: base/numerics (copied from Chromium) > > This copies the contents (unittest excluded) of base/numerics in > chromium to base/numerics in webrtc. Files added: > - safe_conversions.h > - safe_conversions_impl.h > - safe_math.h > - safe_math_impl.h > > A really old version of safe_conversions[_impl].h previously existed in > base/, this has been deleted and sources using it have been updated > to include the new base/numerics/safe_converions.h. > > This CL also adds a DEPS file to webrtc/base. > > NOPRESUBMIT=True > BUG=webrtc:5548, webrtc:5623 > > Committed: https://crrev.com/de1c81b2d2196be611674aa6019b9db3a9329042 > Cr-Commit-Position: refs/heads/master@{#11907} TBR=kjellander@webrtc.org,kwiberg@webrtc.org,tina.legrand@webrtc.org,hbos@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:5548, webrtc:5623 Review URL: https://codereview.webrtc.org/1792613002 . Cr-Commit-Position: refs/heads/master@{#11965}
202 lines
7.5 KiB
C++
202 lines
7.5 KiB
C++
/*
|
|
* Copyright (c) 2014 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/common_audio/audio_converter.h"
|
|
|
|
#include <cstring>
|
|
#include <utility>
|
|
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/base/safe_conversions.h"
|
|
#include "webrtc/common_audio/channel_buffer.h"
|
|
#include "webrtc/common_audio/resampler/push_sinc_resampler.h"
|
|
#include "webrtc/system_wrappers/include/scoped_vector.h"
|
|
|
|
using rtc::checked_cast;
|
|
|
|
namespace webrtc {
|
|
|
|
class CopyConverter : public AudioConverter {
|
|
public:
|
|
CopyConverter(size_t src_channels, size_t src_frames, size_t dst_channels,
|
|
size_t dst_frames)
|
|
: AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {}
|
|
~CopyConverter() override {};
|
|
|
|
void Convert(const float* const* src, size_t src_size, float* const* dst,
|
|
size_t dst_capacity) override {
|
|
CheckSizes(src_size, dst_capacity);
|
|
if (src != dst) {
|
|
for (size_t i = 0; i < src_channels(); ++i)
|
|
std::memcpy(dst[i], src[i], dst_frames() * sizeof(*dst[i]));
|
|
}
|
|
}
|
|
};
|
|
|
|
class UpmixConverter : public AudioConverter {
|
|
public:
|
|
UpmixConverter(size_t src_channels, size_t src_frames, size_t dst_channels,
|
|
size_t dst_frames)
|
|
: AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {}
|
|
~UpmixConverter() override {};
|
|
|
|
void Convert(const float* const* src, size_t src_size, float* const* dst,
|
|
size_t dst_capacity) override {
|
|
CheckSizes(src_size, dst_capacity);
|
|
for (size_t i = 0; i < dst_frames(); ++i) {
|
|
const float value = src[0][i];
|
|
for (size_t j = 0; j < dst_channels(); ++j)
|
|
dst[j][i] = value;
|
|
}
|
|
}
|
|
};
|
|
|
|
class DownmixConverter : public AudioConverter {
|
|
public:
|
|
DownmixConverter(size_t src_channels, size_t src_frames, size_t dst_channels,
|
|
size_t dst_frames)
|
|
: AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {
|
|
}
|
|
~DownmixConverter() override {};
|
|
|
|
void Convert(const float* const* src, size_t src_size, float* const* dst,
|
|
size_t dst_capacity) override {
|
|
CheckSizes(src_size, dst_capacity);
|
|
float* dst_mono = dst[0];
|
|
for (size_t i = 0; i < src_frames(); ++i) {
|
|
float sum = 0;
|
|
for (size_t j = 0; j < src_channels(); ++j)
|
|
sum += src[j][i];
|
|
dst_mono[i] = sum / src_channels();
|
|
}
|
|
}
|
|
};
|
|
|
|
class ResampleConverter : public AudioConverter {
|
|
public:
|
|
ResampleConverter(size_t src_channels, size_t src_frames, size_t dst_channels,
|
|
size_t dst_frames)
|
|
: AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {
|
|
resamplers_.reserve(src_channels);
|
|
for (size_t i = 0; i < src_channels; ++i)
|
|
resamplers_.push_back(new PushSincResampler(src_frames, dst_frames));
|
|
}
|
|
~ResampleConverter() override {};
|
|
|
|
void Convert(const float* const* src, size_t src_size, float* const* dst,
|
|
size_t dst_capacity) override {
|
|
CheckSizes(src_size, dst_capacity);
|
|
for (size_t i = 0; i < resamplers_.size(); ++i)
|
|
resamplers_[i]->Resample(src[i], src_frames(), dst[i], dst_frames());
|
|
}
|
|
|
|
private:
|
|
ScopedVector<PushSincResampler> resamplers_;
|
|
};
|
|
|
|
// Apply a vector of converters in serial, in the order given. At least two
|
|
// converters must be provided.
|
|
class CompositionConverter : public AudioConverter {
|
|
public:
|
|
CompositionConverter(ScopedVector<AudioConverter> converters)
|
|
: converters_(std::move(converters)) {
|
|
RTC_CHECK_GE(converters_.size(), 2u);
|
|
// We need an intermediate buffer after every converter.
|
|
for (auto it = converters_.begin(); it != converters_.end() - 1; ++it)
|
|
buffers_.push_back(new ChannelBuffer<float>((*it)->dst_frames(),
|
|
(*it)->dst_channels()));
|
|
}
|
|
~CompositionConverter() override {};
|
|
|
|
void Convert(const float* const* src, size_t src_size, float* const* dst,
|
|
size_t dst_capacity) override {
|
|
converters_.front()->Convert(src, src_size, buffers_.front()->channels(),
|
|
buffers_.front()->size());
|
|
for (size_t i = 2; i < converters_.size(); ++i) {
|
|
auto src_buffer = buffers_[i - 2];
|
|
auto dst_buffer = buffers_[i - 1];
|
|
converters_[i]->Convert(src_buffer->channels(),
|
|
src_buffer->size(),
|
|
dst_buffer->channels(),
|
|
dst_buffer->size());
|
|
}
|
|
converters_.back()->Convert(buffers_.back()->channels(),
|
|
buffers_.back()->size(), dst, dst_capacity);
|
|
}
|
|
|
|
private:
|
|
ScopedVector<AudioConverter> converters_;
|
|
ScopedVector<ChannelBuffer<float>> buffers_;
|
|
};
|
|
|
|
std::unique_ptr<AudioConverter> AudioConverter::Create(size_t src_channels,
|
|
size_t src_frames,
|
|
size_t dst_channels,
|
|
size_t dst_frames) {
|
|
std::unique_ptr<AudioConverter> sp;
|
|
if (src_channels > dst_channels) {
|
|
if (src_frames != dst_frames) {
|
|
ScopedVector<AudioConverter> converters;
|
|
converters.push_back(new DownmixConverter(src_channels, src_frames,
|
|
dst_channels, src_frames));
|
|
converters.push_back(new ResampleConverter(dst_channels, src_frames,
|
|
dst_channels, dst_frames));
|
|
sp.reset(new CompositionConverter(std::move(converters)));
|
|
} else {
|
|
sp.reset(new DownmixConverter(src_channels, src_frames, dst_channels,
|
|
dst_frames));
|
|
}
|
|
} else if (src_channels < dst_channels) {
|
|
if (src_frames != dst_frames) {
|
|
ScopedVector<AudioConverter> converters;
|
|
converters.push_back(new ResampleConverter(src_channels, src_frames,
|
|
src_channels, dst_frames));
|
|
converters.push_back(new UpmixConverter(src_channels, dst_frames,
|
|
dst_channels, dst_frames));
|
|
sp.reset(new CompositionConverter(std::move(converters)));
|
|
} else {
|
|
sp.reset(new UpmixConverter(src_channels, src_frames, dst_channels,
|
|
dst_frames));
|
|
}
|
|
} else if (src_frames != dst_frames) {
|
|
sp.reset(new ResampleConverter(src_channels, src_frames, dst_channels,
|
|
dst_frames));
|
|
} else {
|
|
sp.reset(new CopyConverter(src_channels, src_frames, dst_channels,
|
|
dst_frames));
|
|
}
|
|
|
|
return sp;
|
|
}
|
|
|
|
// For CompositionConverter.
|
|
AudioConverter::AudioConverter()
|
|
: src_channels_(0),
|
|
src_frames_(0),
|
|
dst_channels_(0),
|
|
dst_frames_(0) {}
|
|
|
|
AudioConverter::AudioConverter(size_t src_channels, size_t src_frames,
|
|
size_t dst_channels, size_t dst_frames)
|
|
: src_channels_(src_channels),
|
|
src_frames_(src_frames),
|
|
dst_channels_(dst_channels),
|
|
dst_frames_(dst_frames) {
|
|
RTC_CHECK(dst_channels == src_channels || dst_channels == 1 ||
|
|
src_channels == 1);
|
|
}
|
|
|
|
void AudioConverter::CheckSizes(size_t src_size, size_t dst_capacity) const {
|
|
RTC_CHECK_EQ(src_size, src_channels() * src_frames());
|
|
RTC_CHECK_GE(dst_capacity, dst_channels() * dst_frames());
|
|
}
|
|
|
|
} // namespace webrtc
|