This reverts commit 54d1344d985b00d4d1580dd18057d4618c11ad1f. Reason for revert: Breaks chromium roll, see https://ci.chromium.org/ui/p/chromium/builders/try/linux_chromium_tsan_rel_ng/1080583/overview https://chromium-review.googlesource.com/c/chromium/src/+/3461512 Original change's description: > Reland "Remove unused APM voice activity detection sub-module" > > This reverts commit a751f167c68343f76528436defdbc61600a8d7b3. > > Reason for revert: dependency in a downstream project removed > > Original change's description: > > Revert "Remove unused APM voice activity detection sub-module" > > > > This reverts commit b4e06d032e6f82a65c52ed0c5364ae9e7c0a0215. > > > > Reason for revert: breaking downstream projects > > > > Original change's description: > > > Remove unused APM voice activity detection sub-module > > > > > > API changes: > > > - webrtc::AudioProcessing::Config::VoiceDetection removed > > > - webrtc::AudioProcessingStats::voice_detected deprecated > > > - cricket::AudioOptions::typing_detection deprecated > > > - webrtc::StatsReport::StatsValueName:: > > > kStatsValueNameTypingNoiseState deprecated > > > > > > PSA: https://groups.google.com/g/discuss-webrtc/c/7X6uwmJarE0 > > > > > > Bug: webrtc:11226,webrtc:11292 > > > Change-Id: I8d008b56708cf62961b9857ec052b59fda3b41bf > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/250666 > > > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > > > Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org> > > > Reviewed-by: Sam Zackrisson <saza@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Commit-Queue: Alessio Bazzica <alessiob@webrtc.org> > > > Cr-Commit-Position: refs/heads/main@{#35975} > > > > TBR=gustaf@webrtc.org,saza@webrtc.org,alessiob@webrtc.org,terelius@webrtc.org,hta@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com > > > > Change-Id: Iee01fdb874b4e0331277f3ffe60dacaabc3859a2 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: webrtc:11226,webrtc:11292 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251600 > > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > > Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org> > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > > Cr-Commit-Position: refs/heads/main@{#35977} > > # Not skipping CQ checks because this is a reland. > > Bug: webrtc:11226,webrtc:11292 > Change-Id: I2fcbc5fdade16bfe6a0f0a02841a33a598d4f2ad > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251660 > Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Commit-Queue: Alessio Bazzica <alessiob@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#35984} TBR=mbonadei@webrtc.org,gustaf@webrtc.org,saza@webrtc.org,alessiob@webrtc.org,terelius@webrtc.org,hta@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com Change-Id: Ib308a3af2dcce85a0074ef5a4680ccec3f82712f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:11226,webrtc:11292 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251688 Reviewed-by: Henrik Boström <hbos@webrtc.org> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Auto-Submit: Henrik Boström <hbos@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35990}
93 lines
2.9 KiB
C++
93 lines
2.9 KiB
C++
/*
|
|
* Copyright (c) 2019 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 "modules/audio_processing/voice_detection.h"
|
|
|
|
#include "common_audio/vad/include/webrtc_vad.h"
|
|
#include "modules/audio_processing/audio_buffer.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
class VoiceDetection::Vad {
|
|
public:
|
|
Vad() {
|
|
state_ = WebRtcVad_Create();
|
|
RTC_CHECK(state_);
|
|
int error = WebRtcVad_Init(state_);
|
|
RTC_DCHECK_EQ(0, error);
|
|
}
|
|
~Vad() { WebRtcVad_Free(state_); }
|
|
|
|
Vad(Vad&) = delete;
|
|
Vad& operator=(Vad&) = delete;
|
|
|
|
VadInst* state() { return state_; }
|
|
|
|
private:
|
|
VadInst* state_ = nullptr;
|
|
};
|
|
|
|
VoiceDetection::VoiceDetection(int sample_rate_hz, Likelihood likelihood)
|
|
: sample_rate_hz_(sample_rate_hz),
|
|
frame_size_samples_(static_cast<size_t>(sample_rate_hz_ / 100)),
|
|
likelihood_(likelihood),
|
|
vad_(new Vad()) {
|
|
int mode = 2;
|
|
switch (likelihood) {
|
|
case VoiceDetection::kVeryLowLikelihood:
|
|
mode = 3;
|
|
break;
|
|
case VoiceDetection::kLowLikelihood:
|
|
mode = 2;
|
|
break;
|
|
case VoiceDetection::kModerateLikelihood:
|
|
mode = 1;
|
|
break;
|
|
case VoiceDetection::kHighLikelihood:
|
|
mode = 0;
|
|
break;
|
|
default:
|
|
RTC_DCHECK_NOTREACHED();
|
|
break;
|
|
}
|
|
int error = WebRtcVad_set_mode(vad_->state(), mode);
|
|
RTC_DCHECK_EQ(0, error);
|
|
}
|
|
|
|
VoiceDetection::~VoiceDetection() {}
|
|
|
|
bool VoiceDetection::ProcessCaptureAudio(AudioBuffer* audio) {
|
|
RTC_DCHECK_GE(AudioBuffer::kMaxSplitFrameLength,
|
|
audio->num_frames_per_band());
|
|
std::array<int16_t, AudioBuffer::kMaxSplitFrameLength> mixed_low_pass_data;
|
|
rtc::ArrayView<const int16_t> mixed_low_pass(mixed_low_pass_data.data(),
|
|
audio->num_frames_per_band());
|
|
if (audio->num_channels() == 1) {
|
|
FloatS16ToS16(audio->split_bands_const(0)[kBand0To8kHz],
|
|
audio->num_frames_per_band(), mixed_low_pass_data.data());
|
|
} else {
|
|
const int num_channels = static_cast<int>(audio->num_channels());
|
|
for (size_t i = 0; i < audio->num_frames_per_band(); ++i) {
|
|
int32_t value =
|
|
FloatS16ToS16(audio->split_channels_const(kBand0To8kHz)[0][i]);
|
|
for (int j = 1; j < num_channels; ++j) {
|
|
value += FloatS16ToS16(audio->split_channels_const(kBand0To8kHz)[j][i]);
|
|
}
|
|
mixed_low_pass_data[i] = value / num_channels;
|
|
}
|
|
}
|
|
|
|
int vad_ret = WebRtcVad_Process(vad_->state(), sample_rate_hz_,
|
|
mixed_low_pass.data(), frame_size_samples_);
|
|
RTC_DCHECK(vad_ret == 0 || vad_ret == 1);
|
|
return vad_ret == 0 ? false : true;
|
|
}
|
|
} // namespace webrtc
|