zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make VoiceDetection not a ProcessingComponent (bit exact).

Browse Source 
BUG=webrtc:5354

Review URL: https://codereview.webrtc.org/1494593004

Cr-Commit-Position: refs/heads/master@{#11047}
This commit is contained in:
solenberg
2015-12-16 03:31:12 -08:00
committed by Commit bot
parent 672aba3f57
commit a29386c26d
4 changed files with 106 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
webrtc/modules/audio_processing/voice_detection_impl.h
View File

@ -11,31 +11,27 @@
#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_
#define WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/modules/audio_processing/processing_component.h"
namespace webrtc {
class AudioBuffer;
class VoiceDetectionImpl : public VoiceDetection,
public ProcessingComponent {
class VoiceDetectionImpl : public VoiceDetection {
public:
VoiceDetectionImpl(const AudioProcessing* apm, rtc::CriticalSection* crit);
virtual ~VoiceDetectionImpl();
explicit VoiceDetectionImpl(rtc::CriticalSection* crit);
~VoiceDetectionImpl() override;
int ProcessCaptureAudio(AudioBuffer* audio);
// TODO(peah): Fold into ctor, once public API is removed.
void Initialize(int sample_rate_hz);
void ProcessCaptureAudio(AudioBuffer* audio);
// VoiceDetection implementation.
bool is_enabled() const override;
// ProcessingComponent implementation.
int Initialize() override;
private:
// VoiceDetection implementation.
int Enable(bool enable) override;
bool is_enabled() const override;
int set_stream_has_voice(bool has_voice) override;
bool stream_has_voice() const override;
int set_likelihood(Likelihood likelihood) override;
@ -43,24 +39,18 @@ class VoiceDetectionImpl : public VoiceDetection,
int set_frame_size_ms(int size) override;
int frame_size_ms() const override;
// ProcessingComponent implementation.
void* CreateHandle() const override;
int InitializeHandle(void* handle) const override;
int ConfigureHandle(void* handle) const override;
void DestroyHandle(void* handle) const override;
int num_handles_required() const override;
int GetHandleError(void* handle) const override;
// Not guarded as its public API is thread safe.
const AudioProcessing* apm_;
private:
class Vad;
rtc::CriticalSection* const crit_;
bool stream_has_voice_ GUARDED_BY(crit_);
bool using_external_vad_ GUARDED_BY(crit_);
Likelihood likelihood_ GUARDED_BY(crit_);
int frame_size_ms_ GUARDED_BY(crit_);
size_t frame_size_samples_ GUARDED_BY(crit_);
bool enabled_ GUARDED_BY(crit_) = false;
bool stream_has_voice_ GUARDED_BY(crit_) = false;
bool using_external_vad_ GUARDED_BY(crit_) = false;
Likelihood likelihood_ GUARDED_BY(crit_) = kLowLikelihood;
int frame_size_ms_ GUARDED_BY(crit_) = 10;
size_t frame_size_samples_ GUARDED_BY(crit_) = 0;
int sample_rate_hz_ GUARDED_BY(crit_) = 0;
rtc::scoped_ptr<Vad> vad_ GUARDED_BY(crit_);
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(VoiceDetectionImpl);
};
} // namespace webrtc