generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VoE: format VoEBase according to new style guide

Browse Source 
Purely cosmetic changes:
1. virtual => override
2. NULL => nullptr
3. data member name: underscore prefix => suffix
4. clang format

R=kwiberg@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/49669004

Cr-Commit-Position: refs/heads/master@{#8997}
This commit is contained in:
Jelena Marusic 2015-04-14 09:47:00 +02:00
parent 0de7bcf06a
commit 2dd6a270c0
2 changed files with 655 additions and 828 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

704
webrtc/voice_engine/voe_base_impl.cc
View File

File diff suppressed because it is too large Load Diff

157
webrtc/voice_engine/voe_base_impl.h
View File

@ -16,107 +16,78 @@
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/voice_engine/shared_data.h"
namespace webrtc
{
namespace webrtc {
class ProcessThread;
class VoEBaseImpl: public VoEBase,
class VoEBaseImpl : public VoEBase,
public AudioTransport,
public AudioDeviceObserver
{
public:
virtual int RegisterVoiceEngineObserver(VoiceEngineObserver& observer);
public AudioDeviceObserver {
public:
int RegisterVoiceEngineObserver(VoiceEngineObserver& observer) override;
int DeRegisterVoiceEngineObserver() override;
virtual int DeRegisterVoiceEngineObserver();
virtual int Init(AudioDeviceModule* external_adm = NULL,
AudioProcessing* audioproc = NULL);
virtual AudioProcessing* audio_processing() {
return _shared->audio_processing();
int Init(AudioDeviceModule* external_adm = nullptr,
AudioProcessing* audioproc = nullptr) override;
AudioProcessing* audio_processing() override {
return shared_->audio_processing();
}
int Terminate() override;
virtual int Terminate();
int CreateChannel() override;
int CreateChannel(const Config& config) override;
int DeleteChannel(int channel) override;
virtual int CreateChannel();
virtual int CreateChannel(const Config& config);
int StartReceive(int channel) override;
int StartPlayout(int channel) override;
int StartSend(int channel) override;
int StopReceive(int channel) override;
int StopPlayout(int channel) override;
int StopSend(int channel) override;
virtual int DeleteChannel(int channel);
int GetVersion(char version[1024]) override;
virtual int StartReceive(int channel);
int LastError() override;
virtual int StartPlayout(int channel);
virtual int StartSend(int channel);
virtual int StopReceive(int channel);
virtual int StopPlayout(int channel);
virtual int StopSend(int channel);
virtual int GetVersion(char version[1024]);
virtual int LastError();
virtual AudioTransport* audio_transport() { return this; }
AudioTransport* audio_transport() override { return this; }
// AudioTransport
virtual int32_t
RecordedDataIsAvailable(const void* audioSamples,
uint32_t nSamples,
uint8_t nBytesPerSample,
uint8_t nChannels,
uint32_t samplesPerSec,
uint32_t totalDelayMS,
int32_t clockDrift,
uint32_t micLevel,
int32_t RecordedDataIsAvailable(const void* audioSamples, uint32_t nSamples,
uint8_t nBytesPerSample, uint8_t nChannels,
uint32_t samplesPerSec, uint32_t totalDelayMS,
int32_t clockDrift, uint32_t micLevel,
bool keyPressed,
uint32_t& newMicLevel);
virtual int32_t NeedMorePlayData(uint32_t nSamples,
uint8_t nBytesPerSample,
uint8_t nChannels,
uint32_t samplesPerSec,
void* audioSamples,
uint32_t& nSamplesOut,
uint32_t& newMicLevel) override;
int32_t NeedMorePlayData(uint32_t nSamples, uint8_t nBytesPerSample,
uint8_t nChannels, uint32_t samplesPerSec,
void* audioSamples, uint32_t& nSamplesOut,
int64_t* elapsed_time_ms,
int64_t* ntp_time_ms);
virtual int OnDataAvailable(const int voe_channels[],
int number_of_voe_channels,
const int16_t* audio_data,
int sample_rate,
int number_of_channels,
int number_of_frames,
int audio_delay_milliseconds,
int volume,
bool key_pressed,
bool need_audio_processing);
virtual void OnData(int voe_channel, const void* audio_data,
int bits_per_sample, int sample_rate,
int number_of_channels, int number_of_frames);
virtual void PushCaptureData(int voe_channel, const void* audio_data,
int bits_per_sample, int sample_rate,
int number_of_channels, int number_of_frames);
virtual void PullRenderData(int bits_per_sample, int sample_rate,
int64_t* ntp_time_ms) override;
int OnDataAvailable(const int voe_channels[], int number_of_voe_channels,
const int16_t* audio_data, int sample_rate,
int number_of_channels, int number_of_frames,
void* audio_data,
int64_t* elapsed_time_ms,
int64_t* ntp_time_ms);
int audio_delay_milliseconds, int volume,
bool key_pressed, bool need_audio_processing) override;
void OnData(int voe_channel, const void* audio_data, int bits_per_sample,
int sample_rate, int number_of_channels,
int number_of_frames) override;
void PushCaptureData(int voe_channel, const void* audio_data,
int bits_per_sample, int sample_rate,
int number_of_channels, int number_of_frames) override;
void PullRenderData(int bits_per_sample, int sample_rate,
int number_of_channels, int number_of_frames,
void* audio_data, int64_t* elapsed_time_ms,
int64_t* ntp_time_ms) override;
// AudioDeviceObserver
virtual void OnErrorIsReported(ErrorCode error);
virtual void OnWarningIsReported(WarningCode warning);
void OnErrorIsReported(ErrorCode error) override;
void OnWarningIsReported(WarningCode warning) override;
protected:
protected:
VoEBaseImpl(voe::SharedData* shared);
virtual ~VoEBaseImpl();
~VoEBaseImpl() override;
private:
private:
int32_t StartPlayout();
int32_t StopPlayout();
int32_t StartSend();
@ -129,21 +100,15 @@ private:
// data to all the existing VoE channels.
// It returns new AGC microphone volume or 0 if no volume changes
// should be done.
int ProcessRecordedDataWithAPM(const int voe_channels[],
int number_of_voe_channels,
const void* audio_data,
uint32_t sample_rate,
uint8_t number_of_channels,
uint32_t number_of_frames,
uint32_t audio_delay_milliseconds,
int32_t clock_drift,
uint32_t volume,
bool key_pressed);
int ProcessRecordedDataWithAPM(
const int voe_channels[], int number_of_voe_channels,
const void* audio_data, uint32_t sample_rate, uint8_t number_of_channels,
uint32_t number_of_frames, uint32_t audio_delay_milliseconds,
int32_t clock_drift, uint32_t volume, bool key_pressed);
void GetPlayoutData(int sample_rate, int number_of_channels,
int number_of_frames, bool feed_data_to_apm,
void* audio_data,
int64_t* elapsed_time_ms,
void* audio_data, int64_t* elapsed_time_ms,
int64_t* ntp_time_ms);
int32_t AddVoEVersion(char* str) const;
@ -154,11 +119,11 @@ private:
#ifdef WEBRTC_EXTERNAL_TRANSPORT
int32_t AddExternalTransportBuild(char* str) const;
#endif
VoiceEngineObserver* _voiceEngineObserverPtr;
CriticalSectionWrapper& _callbackCritSect;
VoiceEngineObserver* voiceEngineObserverPtr_;
CriticalSectionWrapper& callbackCritSect_;
AudioFrame _audioFrame;
voe::SharedData* _shared;
AudioFrame audioFrame_;
voe::SharedData* shared_;
};
} // namespace webrtc