mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-16 15:20:42 +01:00

This reverts commit54d1344d98
. 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 commita751f167c6
. > > Reason for revert: dependency in a downstream project removed > > Original change's description: > > Revert "Remove unused APM voice activity detection sub-module" > > > > This reverts commitb4e06d032e
. > > > > 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}
120 lines
4.5 KiB
C++
120 lines
4.5 KiB
C++
/*
|
|
* Copyright (c) 2016 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.
|
|
*/
|
|
|
|
#ifndef AUDIO_AUDIO_TRANSPORT_IMPL_H_
|
|
#define AUDIO_AUDIO_TRANSPORT_IMPL_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "api/audio/audio_mixer.h"
|
|
#include "api/scoped_refptr.h"
|
|
#include "common_audio/resampler/include/push_resampler.h"
|
|
#include "modules/async_audio_processing/async_audio_processing.h"
|
|
#include "modules/audio_device/include/audio_device.h"
|
|
#include "modules/audio_processing/include/audio_processing.h"
|
|
#include "modules/audio_processing/typing_detection.h"
|
|
#include "rtc_base/synchronization/mutex.h"
|
|
#include "rtc_base/thread_annotations.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class AudioSender;
|
|
|
|
class AudioTransportImpl : public AudioTransport {
|
|
public:
|
|
AudioTransportImpl(
|
|
AudioMixer* mixer,
|
|
AudioProcessing* audio_processing,
|
|
AsyncAudioProcessing::Factory* async_audio_processing_factory);
|
|
|
|
AudioTransportImpl() = delete;
|
|
AudioTransportImpl(const AudioTransportImpl&) = delete;
|
|
AudioTransportImpl& operator=(const AudioTransportImpl&) = delete;
|
|
|
|
~AudioTransportImpl() override;
|
|
|
|
// TODO(bugs.webrtc.org/13620) Deprecate this function
|
|
int32_t RecordedDataIsAvailable(const void* audioSamples,
|
|
size_t nSamples,
|
|
size_t nBytesPerSample,
|
|
size_t nChannels,
|
|
uint32_t samplesPerSec,
|
|
uint32_t totalDelayMS,
|
|
int32_t clockDrift,
|
|
uint32_t currentMicLevel,
|
|
bool keyPressed,
|
|
uint32_t& newMicLevel) override;
|
|
|
|
int32_t RecordedDataIsAvailable(const void* audioSamples,
|
|
size_t nSamples,
|
|
size_t nBytesPerSample,
|
|
size_t nChannels,
|
|
uint32_t samplesPerSec,
|
|
uint32_t totalDelayMS,
|
|
int32_t clockDrift,
|
|
uint32_t currentMicLevel,
|
|
bool keyPressed,
|
|
uint32_t& newMicLevel,
|
|
int64_t estimated_capture_time_ns) override;
|
|
|
|
int32_t NeedMorePlayData(size_t nSamples,
|
|
size_t nBytesPerSample,
|
|
size_t nChannels,
|
|
uint32_t samplesPerSec,
|
|
void* audioSamples,
|
|
size_t& nSamplesOut,
|
|
int64_t* elapsed_time_ms,
|
|
int64_t* ntp_time_ms) override;
|
|
|
|
void PullRenderData(int bits_per_sample,
|
|
int sample_rate,
|
|
size_t number_of_channels,
|
|
size_t number_of_frames,
|
|
void* audio_data,
|
|
int64_t* elapsed_time_ms,
|
|
int64_t* ntp_time_ms) override;
|
|
|
|
void UpdateAudioSenders(std::vector<AudioSender*> senders,
|
|
int send_sample_rate_hz,
|
|
size_t send_num_channels);
|
|
void SetStereoChannelSwapping(bool enable);
|
|
bool typing_noise_detected() const;
|
|
|
|
private:
|
|
void SendProcessedData(std::unique_ptr<AudioFrame> audio_frame);
|
|
|
|
// Shared.
|
|
AudioProcessing* audio_processing_ = nullptr;
|
|
|
|
// Capture side.
|
|
|
|
// Thread-safe.
|
|
const std::unique_ptr<AsyncAudioProcessing> async_audio_processing_;
|
|
|
|
mutable Mutex capture_lock_;
|
|
std::vector<AudioSender*> audio_senders_ RTC_GUARDED_BY(capture_lock_);
|
|
int send_sample_rate_hz_ RTC_GUARDED_BY(capture_lock_) = 8000;
|
|
size_t send_num_channels_ RTC_GUARDED_BY(capture_lock_) = 1;
|
|
bool typing_noise_detected_ RTC_GUARDED_BY(capture_lock_) = false;
|
|
bool swap_stereo_channels_ RTC_GUARDED_BY(capture_lock_) = false;
|
|
PushResampler<int16_t> capture_resampler_;
|
|
TypingDetection typing_detection_;
|
|
|
|
// Render side.
|
|
|
|
rtc::scoped_refptr<AudioMixer> mixer_;
|
|
AudioFrame mixed_frame_;
|
|
// Converts mixed audio to the audio device output rate.
|
|
PushResampler<int16_t> render_resampler_;
|
|
};
|
|
} // namespace webrtc
|
|
|
|
#endif // AUDIO_AUDIO_TRANSPORT_IMPL_H_
|